@atlaskit/link-datasource 1.19.3 → 1.19.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-datasource
 
+## 1.19.4
+
+### Patch Changes
+
+- [#43869](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43869) [`a46528b1133`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a46528b1133) - Update jql searched and insert click analytics events with isQueryComplex attribute.
+
 ## 1.19.3
 
 ### Patch Changes

package/dist/cjs/analytics/constants.js

@@ -7,5 +7,5 @@ exports.packageMetaData = exports.EVENT_CHANNEL = void 0;
 var EVENT_CHANNEL = exports.EVENT_CHANNEL = 'media';
 var packageMetaData = exports.packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.3"
+  packageVersion: "1.19.4"
 };

package/dist/cjs/ui/jira-issues-modal/jira-search-container/index.js

@@ -122,17 +122,20 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     setJql(query);
   }, []);
   var handleSearch = (0, _react.useCallback)(function () {
+    var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(jql);
     onSearch({
       jql: jql
     }, {
       searchMethod: currentSearchMethod,
-      basicFilterSelections: filterSelections
+      basicFilterSelections: filterSelections,
+      isQueryComplex: isCurrentQueryComplex
     });
     if (currentSearchMethod === 'basic') {
       fireEvent('ui.form.submitted.basicSearch', {});
     } else if (currentSearchMethod === 'jql') {
-      fireEvent('ui.jqlEditor.searched', {});
-      var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(jql);
+      fireEvent('ui.jqlEditor.searched', {
+        isQueryComplex: isCurrentQueryComplex
+      });
       setIsComplexQuery(isCurrentQueryComplex);
       if (showBasicFilters && !isCurrentQueryComplex) {
         fetchHydratedJqlOptions();
@@ -147,11 +150,13 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
         orderKey: orderKey
       });
       setJql(jqlWithFilterValues);
+      var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(jqlWithFilterValues);
       onSearch({
         jql: jqlWithFilterValues
       }, {
         searchMethod: currentSearchMethod,
-        basicFilterSelections: filterSelections
+        basicFilterSelections: filterSelections,
+        isQueryComplex: isCurrentQueryComplex
       });
     }, _asyncPopupSelect.SEARCH_DEBOUNCE_MS),
     _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),

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

@@ -142,6 +142,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   var searchMethodSearchedWith = (0, _react.useRef)(null);
   var visibleColumnCount = (0, _react.useRef)((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
   var basicFilterSelectionsSearchedWith = (0, _react.useRef)({});
+  var isSearchedWithComplexQuery = (0, _react.useRef)(false);
   var parameters = (0, _react.useMemo)(function () {
     return !!cloudId ? {
       cloudId: cloudId,
@@ -308,10 +309,12 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   (0, _useColumnPickerRenderedFailedUfoExperience.useColumnPickerRenderedFailedUfoExperience)(status, modalRenderInstanceId);
   var onSearch = (0, _react.useCallback)(function (newParameters, _ref2) {
     var searchMethod = _ref2.searchMethod,
-      basicFilterSelections = _ref2.basicFilterSelections;
+      basicFilterSelections = _ref2.basicFilterSelections,
+      isQueryComplex = _ref2.isQueryComplex;
     searchCount.current++;
     searchMethodSearchedWith.current = searchMethod;
     basicFilterSelectionsSearchedWith.current = basicFilterSelections;
+    isSearchedWithComplexQuery.current = isQueryComplex;
     if (jql !== newParameters.jql) {
       userInteractionActions.current.add(_types.DatasourceAction.QUERY_UPDATED);
     }
@@ -362,7 +365,8 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
         display: getDisplayValue(currentViewMode, totalCount || 0),
         searchCount: searchCount.current,
         searchMethod: (0, _utils.mapSearchMethod)(searchMethodSearchedWith.current),
-        actions: Array.from(userInteractionActions.current)
+        actions: Array.from(userInteractionActions.current),
+        isQueryComplex: isSearchedWithComplexQuery.current
       }, searchMethodSearchedWith.current === 'basic' ? _objectSpread({}, filterSelectionCount) : {}),
       eventType: 'ui'
     });

package/dist/es2019/analytics/constants.js

@@ -1,5 +1,5 @@
 export const EVENT_CHANNEL = 'media';
 export const packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.3"
+  packageVersion: "1.19.4"
 };

package/dist/es2019/ui/jira-issues-modal/jira-search-container/index.js

@@ -92,17 +92,20 @@ export const JiraSearchContainer = props => {
     setJql(query);
   }, []);
   const handleSearch = useCallback(() => {
+    const isCurrentQueryComplex = isQueryTooComplex(jql);
     onSearch({
       jql
     }, {
       searchMethod: currentSearchMethod,
-      basicFilterSelections: filterSelections
+      basicFilterSelections: filterSelections,
+      isQueryComplex: isCurrentQueryComplex
     });
     if (currentSearchMethod === 'basic') {
       fireEvent('ui.form.submitted.basicSearch', {});
     } else if (currentSearchMethod === 'jql') {
-      fireEvent('ui.jqlEditor.searched', {});
-      const isCurrentQueryComplex = isQueryTooComplex(jql);
+      fireEvent('ui.jqlEditor.searched', {
+        isQueryComplex: isCurrentQueryComplex
+      });
       setIsComplexQuery(isCurrentQueryComplex);
       if (showBasicFilters && !isCurrentQueryComplex) {
         fetchHydratedJqlOptions();
@@ -117,11 +120,13 @@ export const JiraSearchContainer = props => {
       orderKey
     });
     setJql(jqlWithFilterValues);
+    const isCurrentQueryComplex = isQueryTooComplex(jqlWithFilterValues);
     onSearch({
       jql: jqlWithFilterValues
     }, {
       searchMethod: currentSearchMethod,
-      basicFilterSelections: filterSelections
+      basicFilterSelections: filterSelections,
+      isQueryComplex: isCurrentQueryComplex
     });
   }, SEARCH_DEBOUNCE_MS);
   const handleBasicFilterSelectionChange = useCallback(filterValues => {

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

@@ -109,6 +109,7 @@ export const PlainJiraIssuesConfigModal = props => {
   const searchMethodSearchedWith = useRef(null);
   const visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
   const basicFilterSelectionsSearchedWith = useRef({});
+  const isSearchedWithComplexQuery = useRef(false);
   const parameters = useMemo(() => !!cloudId ? {
     cloudId,
     jql: jql || ''
@@ -256,11 +257,13 @@ export const PlainJiraIssuesConfigModal = props => {
   useColumnPickerRenderedFailedUfoExperience(status, modalRenderInstanceId);
   const onSearch = useCallback((newParameters, {
     searchMethod,
-    basicFilterSelections
+    basicFilterSelections,
+    isQueryComplex
   }) => {
     searchCount.current++;
     searchMethodSearchedWith.current = searchMethod;
     basicFilterSelectionsSearchedWith.current = basicFilterSelections;
+    isSearchedWithComplexQuery.current = isQueryComplex;
     if (jql !== newParameters.jql) {
       userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
     }
@@ -316,6 +319,7 @@ export const PlainJiraIssuesConfigModal = props => {
         searchCount: searchCount.current,
         searchMethod: mapSearchMethod(searchMethodSearchedWith.current),
         actions: Array.from(userInteractionActions.current),
+        isQueryComplex: isSearchedWithComplexQuery.current,
         ...(searchMethodSearchedWith.current === 'basic' ? {
           ...filterSelectionCount
         } : {})

package/dist/esm/analytics/constants.js

@@ -1,5 +1,5 @@
 export var EVENT_CHANNEL = 'media';
 export var packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.3"
+  packageVersion: "1.19.4"
 };

package/dist/esm/ui/jira-issues-modal/jira-search-container/index.js

@@ -113,17 +113,20 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     setJql(query);
   }, []);
   var handleSearch = useCallback(function () {
+    var isCurrentQueryComplex = isQueryTooComplex(jql);
     onSearch({
       jql: jql
     }, {
       searchMethod: currentSearchMethod,
-      basicFilterSelections: filterSelections
+      basicFilterSelections: filterSelections,
+      isQueryComplex: isCurrentQueryComplex
     });
     if (currentSearchMethod === 'basic') {
       fireEvent('ui.form.submitted.basicSearch', {});
     } else if (currentSearchMethod === 'jql') {
-      fireEvent('ui.jqlEditor.searched', {});
-      var isCurrentQueryComplex = isQueryTooComplex(jql);
+      fireEvent('ui.jqlEditor.searched', {
+        isQueryComplex: isCurrentQueryComplex
+      });
       setIsComplexQuery(isCurrentQueryComplex);
       if (showBasicFilters && !isCurrentQueryComplex) {
         fetchHydratedJqlOptions();
@@ -138,11 +141,13 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
         orderKey: orderKey
       });
       setJql(jqlWithFilterValues);
+      var isCurrentQueryComplex = isQueryTooComplex(jqlWithFilterValues);
       onSearch({
         jql: jqlWithFilterValues
       }, {
         searchMethod: currentSearchMethod,
-        basicFilterSelections: filterSelections
+        basicFilterSelections: filterSelections,
+        isQueryComplex: isCurrentQueryComplex
       });
     }, SEARCH_DEBOUNCE_MS),
     _useDebouncedCallback2 = _slicedToArray(_useDebouncedCallback, 1),

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

@@ -133,6 +133,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
   var searchMethodSearchedWith = useRef(null);
   var visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
   var basicFilterSelectionsSearchedWith = useRef({});
+  var isSearchedWithComplexQuery = useRef(false);
   var parameters = useMemo(function () {
     return !!cloudId ? {
       cloudId: cloudId,
@@ -299,10 +300,12 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
   useColumnPickerRenderedFailedUfoExperience(status, modalRenderInstanceId);
   var onSearch = useCallback(function (newParameters, _ref2) {
     var searchMethod = _ref2.searchMethod,
-      basicFilterSelections = _ref2.basicFilterSelections;
+      basicFilterSelections = _ref2.basicFilterSelections,
+      isQueryComplex = _ref2.isQueryComplex;
     searchCount.current++;
     searchMethodSearchedWith.current = searchMethod;
     basicFilterSelectionsSearchedWith.current = basicFilterSelections;
+    isSearchedWithComplexQuery.current = isQueryComplex;
     if (jql !== newParameters.jql) {
       userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
     }
@@ -353,7 +356,8 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
         display: getDisplayValue(currentViewMode, totalCount || 0),
         searchCount: searchCount.current,
         searchMethod: mapSearchMethod(searchMethodSearchedWith.current),
-        actions: Array.from(userInteractionActions.current)
+        actions: Array.from(userInteractionActions.current),
+        isQueryComplex: isSearchedWithComplexQuery.current
       }, searchMethodSearchedWith.current === 'basic' ? _objectSpread({}, filterSelectionCount) : {}),
       eventType: 'ui'
     });

package/dist/types/analytics/generated/analytics.types.d.ts

@@ -3,7 +3,7 @@
  *
  * Generates Typescript types for analytics events from analytics.spec.yaml
  *
- * @codegen <<SignedSource::650bd05729c6d9d8eb143f643a8c34c2>>
+ * @codegen <<SignedSource::32dd97482f811937fcb07590b84179dd>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -21,7 +21,9 @@ export type ModalReadyDatasourceAttributesType = {
     instancesCount: number | null;
     schemasCount: number | null;
 };
-export type JqlEditorSearchedAttributesType = {};
+export type JqlEditorSearchedAttributesType = {
+    isQueryComplex: boolean;
+};
 export type FormSubmittedBasicSearchAttributesType = {};
 export type EmptyResultShownDatasourceAttributesType = {};
 export type ErrorShownAttributesType = {
@@ -40,6 +42,7 @@ export type ButtonClickedInsertAttributesType = {
     searchMethod: 'datasource_search_query' | 'datasource_basic_filter' | 'datasource_saved_filter' | null;
     extensionKey: string | null;
     actions: unknown[];
+    isQueryComplex: boolean;
 };
 export type ButtonClickedCancelAttributesType = {
     searchCount: number;

package/dist/types/ui/jira-issues-modal/jira-search-container/index.d.ts

@@ -8,6 +8,7 @@ export interface SearchContainerProps {
     onSearch: (query: JiraIssueDatasourceParametersQuery, { searchMethod, basicFilterSelections, }: {
         searchMethod: JiraSearchMethod;
         basicFilterSelections: SelectedOptionsMap;
+        isQueryComplex: boolean;
     }) => void;
     initialSearchMethod: JiraSearchMethod;
     onSearchMethodChange: (searchMethod: JiraSearchMethod) => void;

package/dist/types-ts4.5/analytics/generated/analytics.types.d.ts

@@ -3,7 +3,7 @@
  *
  * Generates Typescript types for analytics events from analytics.spec.yaml
  *
- * @codegen <<SignedSource::650bd05729c6d9d8eb143f643a8c34c2>>
+ * @codegen <<SignedSource::32dd97482f811937fcb07590b84179dd>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -21,7 +21,9 @@ export type ModalReadyDatasourceAttributesType = {
     instancesCount: number | null;
     schemasCount: number | null;
 };
-export type JqlEditorSearchedAttributesType = {};
+export type JqlEditorSearchedAttributesType = {
+    isQueryComplex: boolean;
+};
 export type FormSubmittedBasicSearchAttributesType = {};
 export type EmptyResultShownDatasourceAttributesType = {};
 export type ErrorShownAttributesType = {
@@ -40,6 +42,7 @@ export type ButtonClickedInsertAttributesType = {
     searchMethod: 'datasource_search_query' | 'datasource_basic_filter' | 'datasource_saved_filter' | null;
     extensionKey: string | null;
     actions: unknown[];
+    isQueryComplex: boolean;
 };
 export type ButtonClickedCancelAttributesType = {
     searchCount: number;

package/dist/types-ts4.5/ui/jira-issues-modal/jira-search-container/index.d.ts

@@ -8,6 +8,7 @@ export interface SearchContainerProps {
     onSearch: (query: JiraIssueDatasourceParametersQuery, { searchMethod, basicFilterSelections, }: {
         searchMethod: JiraSearchMethod;
         basicFilterSelections: SelectedOptionsMap;
+        isQueryComplex: boolean;
     }) => void;
     initialSearchMethod: JiraSearchMethod;
     onSearchMethodChange: (searchMethod: JiraSearchMethod) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.19.3",
+  "version": "1.19.4",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
     "@atlaskit/jql-ast": "^3.0.0",
     "@atlaskit/jql-editor-autocomplete-rest": "^2.0.0",
     "@atlaskit/link-client-extension": "^1.8.0",
-    "@atlaskit/linking-common": "^4.20.0",
+    "@atlaskit/linking-common": "^4.21.0",
     "@atlaskit/linking-types": "^8.5.0",
     "@atlaskit/lozenge": "^11.4.0",
     "@atlaskit/modal-dialog": "^12.9.0",