@atlaskit/link-datasource 1.24.8 → 1.24.10

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 1.24.10
+
+### Patch Changes
+
+- [#86724](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/86724) [`718a9aa2424d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/718a9aa2424d) - [ED-22607] Remove references to maxFrames for multi bodied extensions and bump adf-schema from 35.7.0 to 35.8.0
+
+## 1.24.9
+
+### Patch Changes
+
+- [#86596](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/86596) [`37621cb1f1b9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/37621cb1f1b9) - Update dependency json-ld-types
+- [#85653](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/85653) [`e0233a62f24a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e0233a62f24a) - Add logic to insert confluence search datasource table ADF from modal
+
 ## 1.24.8
 
 ### Patch Changes

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

@@ -36,7 +36,7 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     }
   }, [cloudId]);
   return /*#__PURE__*/_react.default.createElement(_basicSearchInput.BasicSearchInput, {
-    testId: "confluence-search-datasource-modal--search-input",
+    testId: "confluence-search-datasource-modal",
     isSearching: isSearching,
     onChange: handleSearchChange,
     onSearch: onSearch,

package/dist/cjs/ui/confluence-search-modal/modal/index.js

@@ -8,9 +8,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.ConfluenceSearchConfigModal = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
@@ -23,6 +23,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
 var _colors = require("@atlaskit/theme/colors");
+var _adf = require("../../../common/utils/adf");
 var _fetchMessagesForLocale = require("../../../common/utils/locale/fetch-messages-for-locale");
 var _useDatasourceTableState = require("../../../hooks/useDatasourceTableState");
 var _en = _interopRequireDefault(require("../../../i18n/en"));
@@ -58,6 +59,7 @@ var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = function
     initialColumnCustomSizes = props.columnCustomSizes,
     initialWrappedColumnKeys = props.wrappedColumnKeys,
     onCancel = props.onCancel,
+    onInsert = props.onInsert,
     initialParameters = props.parameters,
     urlBeingEdited = props.url,
     initialVisibleColumnKeys = props.visibleColumnKeys;
@@ -81,11 +83,11 @@ var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = function
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829210
   var parameters = (0, _react.useMemo)(function () {
-    return cloudId ? {
+    return _objectSpread(_objectSpread({}, initialParameters), {}, {
       cloudId: cloudId,
       searchString: searchString
-    } : undefined;
-  }, [cloudId, searchString /** Add more parameters when more filters are added */]);
+    });
+  }, [cloudId, initialParameters, searchString /** Add more parameters when more filters are added */]);
   var isParametersSet = (0, _react.useMemo)(function () {
     return !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(function (v) {
       return v !== undefined;
@@ -243,20 +245,32 @@ var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = function
   }, [columns.length, selectedConfluenceSiteUrl, confluenceSearchTable, resolvedWithNoResults, status, urlBeingEdited, hasConfluenceSearchParams]);
   var shouldShowResultsCount = !!totalCount && totalCount !== 1;
   var onInsertPressed = (0, _react.useCallback)(function () {
-    // eslint-disable-next-line no-console
-    // TODO: Implement onInsert in EDM-9412
-    /**
-     * onInsert(
-          {
-            type: 'inlineCard',
-            attrs: {
-              url,
-            },
-          } as InlineCardAdf,
-          consumerEvent,
-        );
-     */
-  }, []);
+    if (!isParametersSet || !cloudId) {
+      return;
+    }
+    onInsert((0, _adf.buildDatasourceAdf)({
+      id: datasourceId,
+      parameters: _objectSpread(_objectSpread({}, parameters), {}, {
+        cloudId: cloudId
+      }),
+      views: [{
+        type: 'table',
+        properties: {
+          columns: (visibleColumnKeys || []).map(function (key) {
+            var width = columnCustomSizes === null || columnCustomSizes === void 0 ? void 0 : columnCustomSizes[key];
+            var isWrapped = wrappedColumnKeys === null || wrappedColumnKeys === void 0 ? void 0 : wrappedColumnKeys.includes(key);
+            return _objectSpread(_objectSpread({
+              key: key
+            }, width ? {
+              width: width
+            } : {}), isWrapped ? {
+              isWrapped: isWrapped
+            } : {});
+          })
+        }
+      }]
+    }));
+  }, [cloudId, isParametersSet, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   var onSearch = (0, _react.useCallback)(function (newSearchString) {
     setSearchString(newSearchString);
     reset({

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

@@ -23,7 +23,7 @@ const ConfluenceSearchContainer = ({
     }
   }, [cloudId]);
   return /*#__PURE__*/React.createElement(BasicSearchInput, {
-    testId: "confluence-search-datasource-modal--search-input",
+    testId: "confluence-search-datasource-modal",
     isSearching: isSearching,
     onChange: handleSearchChange,
     onSearch: onSearch,

package/dist/es2019/ui/confluence-search-modal/modal/index.js

@@ -11,6 +11,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { N800 } from '@atlaskit/theme/colors';
+import { buildDatasourceAdf } from '../../../common/utils/adf';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
 import i18nEN from '../../../i18n/en';
@@ -44,6 +45,7 @@ export const ConfluenceSearchConfigModal = props => {
     columnCustomSizes: initialColumnCustomSizes,
     wrappedColumnKeys: initialWrappedColumnKeys,
     onCancel,
+    onInsert,
     parameters: initialParameters,
     url: urlBeingEdited,
     visibleColumnKeys: initialVisibleColumnKeys
@@ -55,10 +57,11 @@ export const ConfluenceSearchConfigModal = props => {
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829210
-  const parameters = useMemo(() => cloudId ? {
+  const parameters = useMemo(() => ({
+    ...initialParameters,
     cloudId,
     searchString
-  } : undefined, [cloudId, searchString /** Add more parameters when more filters are added */]);
+  }), [cloudId, initialParameters, searchString /** Add more parameters when more filters are added */]);
   const isParametersSet = useMemo(() => !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(v => v !== undefined).length > 1, [cloudId, parameters]);
   const {
     reset,
@@ -184,20 +187,35 @@ export const ConfluenceSearchConfigModal = props => {
   }, [columns.length, selectedConfluenceSiteUrl, confluenceSearchTable, resolvedWithNoResults, status, urlBeingEdited, hasConfluenceSearchParams]);
   const shouldShowResultsCount = !!totalCount && totalCount !== 1;
   const onInsertPressed = useCallback(() => {
-    // eslint-disable-next-line no-console
-    // TODO: Implement onInsert in EDM-9412
-    /**
-     * onInsert(
-          {
-            type: 'inlineCard',
-            attrs: {
-              url,
-            },
-          } as InlineCardAdf,
-          consumerEvent,
-        );
-     */
-  }, []);
+    if (!isParametersSet || !cloudId) {
+      return;
+    }
+    onInsert(buildDatasourceAdf({
+      id: datasourceId,
+      parameters: {
+        ...parameters,
+        cloudId
+      },
+      views: [{
+        type: 'table',
+        properties: {
+          columns: (visibleColumnKeys || []).map(key => {
+            const width = columnCustomSizes === null || columnCustomSizes === void 0 ? void 0 : columnCustomSizes[key];
+            const isWrapped = wrappedColumnKeys === null || wrappedColumnKeys === void 0 ? void 0 : wrappedColumnKeys.includes(key);
+            return {
+              key,
+              ...(width ? {
+                width
+              } : {}),
+              ...(isWrapped ? {
+                isWrapped
+              } : {})
+            };
+          })
+        }
+      }]
+    }));
+  }, [cloudId, isParametersSet, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   const onSearch = useCallback(newSearchString => {
     setSearchString(newSearchString);
     reset({

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

@@ -26,7 +26,7 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     }
   }, [cloudId]);
   return /*#__PURE__*/React.createElement(BasicSearchInput, {
-    testId: "confluence-search-datasource-modal--search-input",
+    testId: "confluence-search-datasource-modal",
     isSearching: isSearching,
     onChange: handleSearchChange,
     onSearch: onSearch,

package/dist/esm/ui/confluence-search-modal/modal/index.js

@@ -1,11 +1,11 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 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) { _defineProperty(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; }
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 /** @jsx jsx */
 import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { jsx } from '@emotion/react';
@@ -18,6 +18,7 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { N800 } from '@atlaskit/theme/colors';
+import { buildDatasourceAdf } from '../../../common/utils/adf';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
 import i18nEN from '../../../i18n/en';
@@ -49,6 +50,7 @@ export var ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(pr
     initialColumnCustomSizes = props.columnCustomSizes,
     initialWrappedColumnKeys = props.wrappedColumnKeys,
     onCancel = props.onCancel,
+    onInsert = props.onInsert,
     initialParameters = props.parameters,
     urlBeingEdited = props.url,
     initialVisibleColumnKeys = props.visibleColumnKeys;
@@ -72,11 +74,11 @@ export var ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(pr
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829210
   var parameters = useMemo(function () {
-    return cloudId ? {
+    return _objectSpread(_objectSpread({}, initialParameters), {}, {
       cloudId: cloudId,
       searchString: searchString
-    } : undefined;
-  }, [cloudId, searchString /** Add more parameters when more filters are added */]);
+    });
+  }, [cloudId, initialParameters, searchString /** Add more parameters when more filters are added */]);
   var isParametersSet = useMemo(function () {
     return !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(function (v) {
       return v !== undefined;
@@ -234,20 +236,32 @@ export var ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(pr
   }, [columns.length, selectedConfluenceSiteUrl, confluenceSearchTable, resolvedWithNoResults, status, urlBeingEdited, hasConfluenceSearchParams]);
   var shouldShowResultsCount = !!totalCount && totalCount !== 1;
   var onInsertPressed = useCallback(function () {
-    // eslint-disable-next-line no-console
-    // TODO: Implement onInsert in EDM-9412
-    /**
-     * onInsert(
-          {
-            type: 'inlineCard',
-            attrs: {
-              url,
-            },
-          } as InlineCardAdf,
-          consumerEvent,
-        );
-     */
-  }, []);
+    if (!isParametersSet || !cloudId) {
+      return;
+    }
+    onInsert(buildDatasourceAdf({
+      id: datasourceId,
+      parameters: _objectSpread(_objectSpread({}, parameters), {}, {
+        cloudId: cloudId
+      }),
+      views: [{
+        type: 'table',
+        properties: {
+          columns: (visibleColumnKeys || []).map(function (key) {
+            var width = columnCustomSizes === null || columnCustomSizes === void 0 ? void 0 : columnCustomSizes[key];
+            var isWrapped = wrappedColumnKeys === null || wrappedColumnKeys === void 0 ? void 0 : wrappedColumnKeys.includes(key);
+            return _objectSpread(_objectSpread({
+              key: key
+            }, width ? {
+              width: width
+            } : {}), isWrapped ? {
+              isWrapped: isWrapped
+            } : {});
+          })
+        }
+      }]
+    }));
+  }, [cloudId, isParametersSet, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   var onSearch = useCallback(function (newSearchString) {
     setSearchString(newSearchString);
     reset({

package/dist/types/ui/confluence-search-modal/types.d.ts

@@ -1,12 +1,22 @@
 import { DatasourceAdf } from '@atlaskit/linking-common/types';
 import { ConfigModalProps } from '../../common/types';
-export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<ConfluenceSearchDatasourceAdf, {
-    cloudId: string;
-    searchString?: string;
-}> {
+export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<ConfluenceSearchDatasourceAdf, ConfluenceSearchDatasourceParameters> {
 }
 export type ConfluenceSearchDatasourceParameters = {
     cloudId: string;
     searchString?: string;
+    entityTypes?: string[];
+    contentARIs?: string[];
+    spaceKeys?: string[];
+    contributorAccountIds?: string[];
+    labels?: string[];
+    ancestorPageIds?: string[];
+    containerStatus?: string[];
+    contentStatuses?: string[];
+    creatorAccountIds?: string[];
+    lastModified?: 'today' | 'yesterday' | 'past7Days' | 'past30Days' | 'pastYear' | 'custom';
+    lastModifiedFrom?: string;
+    lastModifiedTo?: string;
+    shouldMatchTitleOnly?: boolean;
 };
 export type ConfluenceSearchDatasourceAdf = DatasourceAdf<ConfluenceSearchDatasourceParameters>;

package/dist/types-ts4.5/ui/confluence-search-modal/types.d.ts

@@ -1,12 +1,22 @@
 import { DatasourceAdf } from '@atlaskit/linking-common/types';
 import { ConfigModalProps } from '../../common/types';
-export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<ConfluenceSearchDatasourceAdf, {
-    cloudId: string;
-    searchString?: string;
-}> {
+export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<ConfluenceSearchDatasourceAdf, ConfluenceSearchDatasourceParameters> {
 }
 export type ConfluenceSearchDatasourceParameters = {
     cloudId: string;
     searchString?: string;
+    entityTypes?: string[];
+    contentARIs?: string[];
+    spaceKeys?: string[];
+    contributorAccountIds?: string[];
+    labels?: string[];
+    ancestorPageIds?: string[];
+    containerStatus?: string[];
+    contentStatuses?: string[];
+    creatorAccountIds?: string[];
+    lastModified?: 'today' | 'yesterday' | 'past7Days' | 'past30Days' | 'pastYear' | 'custom';
+    lastModifiedFrom?: string;
+    lastModifiedTo?: string;
+    shouldMatchTitleOnly?: boolean;
 };
 export type ConfluenceSearchDatasourceAdf = DatasourceAdf<ConfluenceSearchDatasourceParameters>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.24.8",
+  "version": "1.24.10",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -31,7 +31,7 @@
     "analytics:codegen": "yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource --output ./src/analytics/generated"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.7.0",
+    "@atlaskit/adf-schema": "^35.8.0",
     "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/avatar": "^21.5.0",
     "@atlaskit/avatar-group": "^9.5.0",
@@ -102,7 +102,7 @@
     "@types/debounce-promise": "^3.1.2",
     "fetch-mock": "^8.0.0",
     "jest-fetch-mock": "^3.0.3",
-    "json-ld-types": "^3.11.0",
+    "json-ld-types": "^4.1.0",
     "typescript": "~5.4.2",
     "wait-for-expect": "^1.2.0"
   },