@atlaskit/editor-plugin-card 22.1.9 → 22.1.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -0
- package/dist/cjs/ui/quick-insert/DatasourceQuickInsertMenuItem.js +9 -3
- package/dist/cjs/ui/quick-insert/getCardQuickInsertComponents.js +27 -0
- package/dist/es2019/ui/quick-insert/DatasourceQuickInsertMenuItem.js +9 -3
- package/dist/es2019/ui/quick-insert/getCardQuickInsertComponents.js +25 -1
- package/dist/esm/ui/quick-insert/DatasourceQuickInsertMenuItem.js +9 -3
- package/dist/esm/ui/quick-insert/getCardQuickInsertComponents.js +28 -1
- package/dist/types/ui/quick-insert/DatasourceQuickInsertMenuItem.d.ts +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-card
|
|
2
2
|
|
|
3
|
+
## 22.1.10
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`c12860a41f49d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c12860a41f49d) -
|
|
8
|
+
Order the Data and charts slash-command menu, including Bitbucket Snippet and GitHub Gist after
|
|
9
|
+
Questions List, when platform_editor_slash_command is enabled.
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
3
12
|
## 22.1.9
|
|
4
13
|
|
|
5
14
|
### Patch Changes
|
|
@@ -9,9 +9,10 @@ exports.DatasourceQuickInsertMenuItem = void 0;
|
|
|
9
9
|
var _react = _interopRequireWildcard(require("react"));
|
|
10
10
|
var _reactIntl = require("react-intl");
|
|
11
11
|
var _messages = require("@atlaskit/editor-common/messages");
|
|
12
|
-
var _quickInsert = require("@atlaskit/editor-common/quick-insert");
|
|
13
12
|
var _menuItem = require("@atlaskit/editor-common/quick-insert/menu-item");
|
|
14
13
|
var _useQuickInsertContext = require("@atlaskit/editor-common/quick-insert/use-quick-insert-context");
|
|
14
|
+
var _assets = _interopRequireDefault(require("@atlaskit/icon/core/assets"));
|
|
15
|
+
var _pages = _interopRequireDefault(require("@atlaskit/icon/core/pages"));
|
|
15
16
|
var _workItems = _interopRequireDefault(require("@atlaskit/icon/core/work-items"));
|
|
16
17
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
17
18
|
var _actions = require("../../pm-plugins/actions");
|
|
@@ -23,6 +24,7 @@ var DatasourceQuickInsertMenuItem = exports.DatasourceQuickInsertMenuItem = func
|
|
|
23
24
|
var _useQuickInsertContex = (0, _useQuickInsertContext.useQuickInsertContext)(),
|
|
24
25
|
isOffline = _useQuickInsertContex.isOffline;
|
|
25
26
|
var isJira = type === 'jira';
|
|
27
|
+
var isConfluenceSearch = type === 'confluence-search';
|
|
26
28
|
var onSelect = (0, _react.useCallback)(function (_ref2) {
|
|
27
29
|
var insert = _ref2.insert;
|
|
28
30
|
var tr = insert(undefined);
|
|
@@ -32,9 +34,13 @@ var DatasourceQuickInsertMenuItem = exports.DatasourceQuickInsertMenuItem = func
|
|
|
32
34
|
return /*#__PURE__*/_react.default.createElement(_menuItem.QuickInsertMenuItem, {
|
|
33
35
|
iconBefore: isJira ? /*#__PURE__*/_react.default.createElement(_workItems.default, {
|
|
34
36
|
label: ""
|
|
35
|
-
}) : /*#__PURE__*/_react.default.createElement(
|
|
37
|
+
}) : isConfluenceSearch ? /*#__PURE__*/_react.default.createElement(_pages.default, {
|
|
38
|
+
label: ""
|
|
39
|
+
}) : /*#__PURE__*/_react.default.createElement(_assets.default, {
|
|
40
|
+
label: ""
|
|
41
|
+
}),
|
|
36
42
|
isDisabled: isOffline,
|
|
37
43
|
onSelect: onSelect,
|
|
38
|
-
title: formatMessage(isJira ? (0, _fg.fg)('confluence-issue-terminology-refresh') ? _messages.cardMessages.datasourceJiraIssueIssueTermRefresh : _messages.cardMessages.datasourceJiraIssue : _messages.cardMessages.datasourceAssetsObjectsGeneralAvailability)
|
|
44
|
+
title: formatMessage(isJira ? (0, _fg.fg)('confluence-issue-terminology-refresh') ? _messages.cardMessages.datasourceJiraIssueIssueTermRefresh : _messages.cardMessages.datasourceJiraIssue : isConfluenceSearch ? _messages.cardMessages.datasourceConfluenceSearch : _messages.cardMessages.datasourceAssetsObjectsGeneralAvailability)
|
|
39
45
|
});
|
|
40
46
|
};
|
|
@@ -12,7 +12,9 @@ var _keys = require("@atlaskit/editor-common/quick-insert/keys");
|
|
|
12
12
|
var _rank = require("@atlaskit/editor-common/quick-insert/rank");
|
|
13
13
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
14
14
|
var _assetsModal = require("@atlaskit/link-datasource/assets-modal");
|
|
15
|
+
var _confluenceSearchModal = require("@atlaskit/link-datasource/confluence-search-modal");
|
|
15
16
|
var _fg = require("@atlaskit/platform-feature-flags/fg");
|
|
17
|
+
var _utils2 = require("../../pm-plugins/utils");
|
|
16
18
|
var _DatasourceQuickInsertMenuItem = require("./DatasourceQuickInsertMenuItem");
|
|
17
19
|
var getCardQuickInsertComponents = exports.getCardQuickInsertComponents = function getCardQuickInsertComponents(_ref) {
|
|
18
20
|
var api = _ref.api,
|
|
@@ -68,5 +70,30 @@ var getCardQuickInsertComponents = exports.getCardQuickInsertComponents = functi
|
|
|
68
70
|
}
|
|
69
71
|
});
|
|
70
72
|
}
|
|
73
|
+
if ((0, _utils2.isDatasourceConfigEditable)(_confluenceSearchModal.CONFLUENCE_SEARCH_DATASOURCE_ID)) {
|
|
74
|
+
components.push({
|
|
75
|
+
key: _keys.CONFLUENCE_LIST_MENU_ITEM.key,
|
|
76
|
+
type: _keys.CONFLUENCE_LIST_MENU_ITEM.type,
|
|
77
|
+
parents: [{
|
|
78
|
+
key: _keys.DATA_AND_CHARTS_SECTION.key,
|
|
79
|
+
type: _keys.DATA_AND_CHARTS_SECTION.type,
|
|
80
|
+
rank: _rank.DATA_AND_CHARTS_SECTION_RANK[_keys.CONFLUENCE_LIST_MENU_ITEM.key]
|
|
81
|
+
}],
|
|
82
|
+
match: (0, _createQuickInsertMatcher.createQuickInsertMatcher)(function (_ref4) {
|
|
83
|
+
var formatMessage = _ref4.formatMessage;
|
|
84
|
+
return {
|
|
85
|
+
description: formatMessage(_messages.cardMessages.datasourceConfluenceSearchDescription),
|
|
86
|
+
keywords: ['confluence'],
|
|
87
|
+
title: formatMessage(_messages.cardMessages.datasourceConfluenceSearch)
|
|
88
|
+
};
|
|
89
|
+
}),
|
|
90
|
+
component: function component() {
|
|
91
|
+
return /*#__PURE__*/_react.default.createElement(_DatasourceQuickInsertMenuItem.DatasourceQuickInsertMenuItem, {
|
|
92
|
+
api: api,
|
|
93
|
+
type: "confluence-search"
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
});
|
|
97
|
+
}
|
|
71
98
|
return components;
|
|
72
99
|
};
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import React, { useCallback } from 'react';
|
|
2
2
|
import { useIntl } from 'react-intl';
|
|
3
3
|
import { cardMessages as messages } from '@atlaskit/editor-common/messages';
|
|
4
|
-
import { IconDatasourceAssetsObjects } from '@atlaskit/editor-common/quick-insert';
|
|
5
4
|
import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
|
|
6
5
|
import { useQuickInsertContext } from '@atlaskit/editor-common/quick-insert/use-quick-insert-context';
|
|
6
|
+
import AssetsIcon from '@atlaskit/icon/core/assets';
|
|
7
|
+
import PagesIcon from '@atlaskit/icon/core/pages';
|
|
7
8
|
import WorkItemsIcon from '@atlaskit/icon/core/work-items';
|
|
8
9
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
9
10
|
import { showDatasourceModal } from '../../pm-plugins/actions';
|
|
@@ -17,6 +18,7 @@ export const DatasourceQuickInsertMenuItem = ({
|
|
|
17
18
|
isOffline
|
|
18
19
|
} = useQuickInsertContext();
|
|
19
20
|
const isJira = type === 'jira';
|
|
21
|
+
const isConfluenceSearch = type === 'confluence-search';
|
|
20
22
|
const onSelect = useCallback(({
|
|
21
23
|
insert
|
|
22
24
|
}) => {
|
|
@@ -27,9 +29,13 @@ export const DatasourceQuickInsertMenuItem = ({
|
|
|
27
29
|
return /*#__PURE__*/React.createElement(QuickInsertMenuItem, {
|
|
28
30
|
iconBefore: isJira ? /*#__PURE__*/React.createElement(WorkItemsIcon, {
|
|
29
31
|
label: ""
|
|
30
|
-
}) : /*#__PURE__*/React.createElement(
|
|
32
|
+
}) : isConfluenceSearch ? /*#__PURE__*/React.createElement(PagesIcon, {
|
|
33
|
+
label: ""
|
|
34
|
+
}) : /*#__PURE__*/React.createElement(AssetsIcon, {
|
|
35
|
+
label: ""
|
|
36
|
+
}),
|
|
31
37
|
isDisabled: isOffline,
|
|
32
38
|
onSelect: onSelect,
|
|
33
|
-
title: formatMessage(isJira ? fg('confluence-issue-terminology-refresh') ? messages.datasourceJiraIssueIssueTermRefresh : messages.datasourceJiraIssue : messages.datasourceAssetsObjectsGeneralAvailability)
|
|
39
|
+
title: formatMessage(isJira ? fg('confluence-issue-terminology-refresh') ? messages.datasourceJiraIssueIssueTermRefresh : messages.datasourceJiraIssue : isConfluenceSearch ? messages.datasourceConfluenceSearch : messages.datasourceAssetsObjectsGeneralAvailability)
|
|
34
40
|
});
|
|
35
41
|
};
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { cardMessages as messages } from '@atlaskit/editor-common/messages';
|
|
3
3
|
import { createQuickInsertMatcher } from '@atlaskit/editor-common/quick-insert/create-quick-insert-matcher';
|
|
4
|
-
import { ASSETS_MENU_ITEM, DATA_AND_CHARTS_SECTION, JIRA_WORK_ITEMS_MENU_ITEM } from '@atlaskit/editor-common/quick-insert/keys';
|
|
4
|
+
import { ASSETS_MENU_ITEM, CONFLUENCE_LIST_MENU_ITEM, DATA_AND_CHARTS_SECTION, JIRA_WORK_ITEMS_MENU_ITEM } from '@atlaskit/editor-common/quick-insert/keys';
|
|
5
5
|
import { DATA_AND_CHARTS_SECTION_RANK } from '@atlaskit/editor-common/quick-insert/rank';
|
|
6
6
|
import { canRenderDatasource } from '@atlaskit/editor-common/utils';
|
|
7
7
|
import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource/assets-modal';
|
|
8
|
+
import { CONFLUENCE_SEARCH_DATASOURCE_ID } from '@atlaskit/link-datasource/confluence-search-modal';
|
|
8
9
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
10
|
+
import { isDatasourceConfigEditable } from '../../pm-plugins/utils';
|
|
9
11
|
import { DatasourceQuickInsertMenuItem } from './DatasourceQuickInsertMenuItem';
|
|
10
12
|
export const getCardQuickInsertComponents = ({
|
|
11
13
|
api,
|
|
@@ -56,5 +58,27 @@ export const getCardQuickInsertComponents = ({
|
|
|
56
58
|
})
|
|
57
59
|
});
|
|
58
60
|
}
|
|
61
|
+
if (isDatasourceConfigEditable(CONFLUENCE_SEARCH_DATASOURCE_ID)) {
|
|
62
|
+
components.push({
|
|
63
|
+
key: CONFLUENCE_LIST_MENU_ITEM.key,
|
|
64
|
+
type: CONFLUENCE_LIST_MENU_ITEM.type,
|
|
65
|
+
parents: [{
|
|
66
|
+
key: DATA_AND_CHARTS_SECTION.key,
|
|
67
|
+
type: DATA_AND_CHARTS_SECTION.type,
|
|
68
|
+
rank: DATA_AND_CHARTS_SECTION_RANK[CONFLUENCE_LIST_MENU_ITEM.key]
|
|
69
|
+
}],
|
|
70
|
+
match: createQuickInsertMatcher(({
|
|
71
|
+
formatMessage
|
|
72
|
+
}) => ({
|
|
73
|
+
description: formatMessage(messages.datasourceConfluenceSearchDescription),
|
|
74
|
+
keywords: ['confluence'],
|
|
75
|
+
title: formatMessage(messages.datasourceConfluenceSearch)
|
|
76
|
+
})),
|
|
77
|
+
component: () => /*#__PURE__*/React.createElement(DatasourceQuickInsertMenuItem, {
|
|
78
|
+
api: api,
|
|
79
|
+
type: "confluence-search"
|
|
80
|
+
})
|
|
81
|
+
});
|
|
82
|
+
}
|
|
59
83
|
return components;
|
|
60
84
|
};
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import React, { useCallback } from 'react';
|
|
2
2
|
import { useIntl } from 'react-intl';
|
|
3
3
|
import { cardMessages as messages } from '@atlaskit/editor-common/messages';
|
|
4
|
-
import { IconDatasourceAssetsObjects } from '@atlaskit/editor-common/quick-insert';
|
|
5
4
|
import { QuickInsertMenuItem } from '@atlaskit/editor-common/quick-insert/menu-item';
|
|
6
5
|
import { useQuickInsertContext } from '@atlaskit/editor-common/quick-insert/use-quick-insert-context';
|
|
6
|
+
import AssetsIcon from '@atlaskit/icon/core/assets';
|
|
7
|
+
import PagesIcon from '@atlaskit/icon/core/pages';
|
|
7
8
|
import WorkItemsIcon from '@atlaskit/icon/core/work-items';
|
|
8
9
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
9
10
|
import { showDatasourceModal } from '../../pm-plugins/actions';
|
|
@@ -14,6 +15,7 @@ export var DatasourceQuickInsertMenuItem = function DatasourceQuickInsertMenuIte
|
|
|
14
15
|
var _useQuickInsertContex = useQuickInsertContext(),
|
|
15
16
|
isOffline = _useQuickInsertContex.isOffline;
|
|
16
17
|
var isJira = type === 'jira';
|
|
18
|
+
var isConfluenceSearch = type === 'confluence-search';
|
|
17
19
|
var onSelect = useCallback(function (_ref2) {
|
|
18
20
|
var insert = _ref2.insert;
|
|
19
21
|
var tr = insert(undefined);
|
|
@@ -23,9 +25,13 @@ export var DatasourceQuickInsertMenuItem = function DatasourceQuickInsertMenuIte
|
|
|
23
25
|
return /*#__PURE__*/React.createElement(QuickInsertMenuItem, {
|
|
24
26
|
iconBefore: isJira ? /*#__PURE__*/React.createElement(WorkItemsIcon, {
|
|
25
27
|
label: ""
|
|
26
|
-
}) : /*#__PURE__*/React.createElement(
|
|
28
|
+
}) : isConfluenceSearch ? /*#__PURE__*/React.createElement(PagesIcon, {
|
|
29
|
+
label: ""
|
|
30
|
+
}) : /*#__PURE__*/React.createElement(AssetsIcon, {
|
|
31
|
+
label: ""
|
|
32
|
+
}),
|
|
27
33
|
isDisabled: isOffline,
|
|
28
34
|
onSelect: onSelect,
|
|
29
|
-
title: formatMessage(isJira ? fg('confluence-issue-terminology-refresh') ? messages.datasourceJiraIssueIssueTermRefresh : messages.datasourceJiraIssue : messages.datasourceAssetsObjectsGeneralAvailability)
|
|
35
|
+
title: formatMessage(isJira ? fg('confluence-issue-terminology-refresh') ? messages.datasourceJiraIssueIssueTermRefresh : messages.datasourceJiraIssue : isConfluenceSearch ? messages.datasourceConfluenceSearch : messages.datasourceAssetsObjectsGeneralAvailability)
|
|
30
36
|
});
|
|
31
37
|
};
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { cardMessages as messages } from '@atlaskit/editor-common/messages';
|
|
3
3
|
import { createQuickInsertMatcher } from '@atlaskit/editor-common/quick-insert/create-quick-insert-matcher';
|
|
4
|
-
import { ASSETS_MENU_ITEM, DATA_AND_CHARTS_SECTION, JIRA_WORK_ITEMS_MENU_ITEM } from '@atlaskit/editor-common/quick-insert/keys';
|
|
4
|
+
import { ASSETS_MENU_ITEM, CONFLUENCE_LIST_MENU_ITEM, DATA_AND_CHARTS_SECTION, JIRA_WORK_ITEMS_MENU_ITEM } from '@atlaskit/editor-common/quick-insert/keys';
|
|
5
5
|
import { DATA_AND_CHARTS_SECTION_RANK } from '@atlaskit/editor-common/quick-insert/rank';
|
|
6
6
|
import { canRenderDatasource } from '@atlaskit/editor-common/utils';
|
|
7
7
|
import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '@atlaskit/link-datasource/assets-modal';
|
|
8
|
+
import { CONFLUENCE_SEARCH_DATASOURCE_ID } from '@atlaskit/link-datasource/confluence-search-modal';
|
|
8
9
|
import { fg } from '@atlaskit/platform-feature-flags/fg';
|
|
10
|
+
import { isDatasourceConfigEditable } from '../../pm-plugins/utils';
|
|
9
11
|
import { DatasourceQuickInsertMenuItem } from './DatasourceQuickInsertMenuItem';
|
|
10
12
|
export var getCardQuickInsertComponents = function getCardQuickInsertComponents(_ref) {
|
|
11
13
|
var api = _ref.api,
|
|
@@ -61,5 +63,30 @@ export var getCardQuickInsertComponents = function getCardQuickInsertComponents(
|
|
|
61
63
|
}
|
|
62
64
|
});
|
|
63
65
|
}
|
|
66
|
+
if (isDatasourceConfigEditable(CONFLUENCE_SEARCH_DATASOURCE_ID)) {
|
|
67
|
+
components.push({
|
|
68
|
+
key: CONFLUENCE_LIST_MENU_ITEM.key,
|
|
69
|
+
type: CONFLUENCE_LIST_MENU_ITEM.type,
|
|
70
|
+
parents: [{
|
|
71
|
+
key: DATA_AND_CHARTS_SECTION.key,
|
|
72
|
+
type: DATA_AND_CHARTS_SECTION.type,
|
|
73
|
+
rank: DATA_AND_CHARTS_SECTION_RANK[CONFLUENCE_LIST_MENU_ITEM.key]
|
|
74
|
+
}],
|
|
75
|
+
match: createQuickInsertMatcher(function (_ref4) {
|
|
76
|
+
var formatMessage = _ref4.formatMessage;
|
|
77
|
+
return {
|
|
78
|
+
description: formatMessage(messages.datasourceConfluenceSearchDescription),
|
|
79
|
+
keywords: ['confluence'],
|
|
80
|
+
title: formatMessage(messages.datasourceConfluenceSearch)
|
|
81
|
+
};
|
|
82
|
+
}),
|
|
83
|
+
component: function component() {
|
|
84
|
+
return /*#__PURE__*/React.createElement(DatasourceQuickInsertMenuItem, {
|
|
85
|
+
api: api,
|
|
86
|
+
type: "confluence-search"
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
});
|
|
90
|
+
}
|
|
64
91
|
return components;
|
|
65
92
|
};
|
|
@@ -3,7 +3,7 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
|
|
|
3
3
|
import type { CardPlugin } from '../../cardPluginType';
|
|
4
4
|
type Props = {
|
|
5
5
|
api: ExtractInjectionAPI<CardPlugin> | undefined;
|
|
6
|
-
type: 'assets' | 'jira';
|
|
6
|
+
type: 'assets' | 'confluence-search' | 'jira';
|
|
7
7
|
};
|
|
8
8
|
export declare const DatasourceQuickInsertMenuItem: ({ type }: Props) => React.JSX.Element;
|
|
9
9
|
export {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-card",
|
|
3
|
-
"version": "22.1.
|
|
3
|
+
"version": "22.1.10",
|
|
4
4
|
"description": "Card plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"@atlaskit/primitives": "^22.5.0",
|
|
64
64
|
"@atlaskit/prosemirror-history": "^1.2.0",
|
|
65
65
|
"@atlaskit/smart-card": "^45.20.0",
|
|
66
|
-
"@atlaskit/tmp-editor-statsig": "^
|
|
66
|
+
"@atlaskit/tmp-editor-statsig": "^177.0.0",
|
|
67
67
|
"@atlaskit/tokens": "^16.11.0",
|
|
68
68
|
"@babel/runtime": "^7.0.0",
|
|
69
69
|
"@emotion/react": "^11.7.1",
|