@atlaskit/user-picker 11.5.0 → 11.6.0

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 CHANGED
@@ -1,5 +1,12 @@
1
1
  # @atlaskit/user-picker
2
2
 
3
+ ## 11.6.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`4660708beb24d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4660708beb24d) -
8
+ Product/App term refresh
9
+
3
10
  ## 11.5.0
4
11
 
5
12
  ### Minor Changes
@@ -12,7 +12,7 @@ var _utils = require("./components/utils");
12
12
  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; }
13
13
  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; }
14
14
  var packageName = "@atlaskit/user-picker";
15
- var packageVersion = "11.4.3";
15
+ var packageVersion = "11.5.0";
16
16
  var UUID_REGEXP_TEAMS_GROUPS = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
17
17
  var UUID_REGEXP_OLD_AAID = /^[a-fA-F0-9]{1,8}:[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
18
18
  var UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;
@@ -14,6 +14,7 @@ var _slack = require("../assets/slack");
14
14
  var _google = require("../assets/google");
15
15
  var _microsoft = require("../assets/microsoft");
16
16
  var _i18n = require("../i18n");
17
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
17
18
  // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
18
19
 
19
20
  var sourcesTooltipContainer = (0, _primitives.xcss)({
@@ -25,6 +26,37 @@ var sourceWrapperStyles = (0, _primitives.xcss)({
25
26
  display: 'flex',
26
27
  alignItems: 'center'
27
28
  });
29
+ var SUPPORTED_SOURCES_APPIFY = [{
30
+ sourceType: 'jira',
31
+ icon: /*#__PURE__*/_react.default.createElement(_logo.JiraIcon, {
32
+ size: 'xxsmall'
33
+ }),
34
+ label: _i18n.messages.jiraSource
35
+ }, {
36
+ sourceType: 'confluence',
37
+ icon: /*#__PURE__*/_react.default.createElement(_logo.ConfluenceIcon, {
38
+ size: 'xxsmall'
39
+ }),
40
+ label: _i18n.messages.confluenceSource
41
+ }, {
42
+ sourceType: 'other-atlassian',
43
+ icon: /*#__PURE__*/_react.default.createElement(_logo.AtlassianIcon, {
44
+ size: 'xxsmall'
45
+ }),
46
+ label: _i18n.messages.otherAtlassianSourceAppify
47
+ }, {
48
+ sourceType: 'slack',
49
+ icon: /*#__PURE__*/_react.default.createElement(_slack.SlackIcon, null),
50
+ label: _i18n.messages.slackProvider
51
+ }, {
52
+ sourceType: 'google',
53
+ icon: /*#__PURE__*/_react.default.createElement(_google.GoogleIcon, null),
54
+ label: _i18n.messages.googleProvider
55
+ }, {
56
+ sourceType: 'microsoft',
57
+ icon: /*#__PURE__*/_react.default.createElement(_microsoft.MicrosoftIcon, null),
58
+ label: _i18n.messages.microsoftProvider
59
+ }];
28
60
  var SUPPORTED_SOURCES = [{
29
61
  sourceType: 'jira',
30
62
  icon: /*#__PURE__*/_react.default.createElement(_logo.JiraIcon, {
@@ -68,7 +100,9 @@ var SourcesTooltipContent = exports.SourcesTooltipContent = function SourcesTool
68
100
  var sources = _ref.sources,
69
101
  sourcesLoading = _ref.sourcesLoading;
70
102
  var sourcesToRender = _react.default.useMemo(function () {
71
- return SUPPORTED_SOURCES.filter(function (supportedSource) {
103
+ return (0, _platformFeatureFlags.fg)('product-terminology-refresh') ? SUPPORTED_SOURCES_APPIFY.filter(function (supportedSource) {
104
+ return sources.includes(supportedSource.sourceType);
105
+ }) : SUPPORTED_SOURCES.filter(function (supportedSource) {
72
106
  return sources.includes(supportedSource.sourceType);
73
107
  });
74
108
  }, [sources]);
@@ -116,6 +116,11 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
116
116
  defaultMessage: 'Other Atlassian products',
117
117
  description: 'This external user is sourced from Atlassian products other than Jira and Confluence'
118
118
  },
119
+ otherAtlassianSourceAppify: {
120
+ id: 'fabric.elements.user-picker.source.other-atlassian-appify',
121
+ defaultMessage: 'Other Atlassian apps',
122
+ description: 'This external user is sourced from Atlassian products other than Jira and Confluence'
123
+ },
119
124
  memberLozengeText: {
120
125
  id: 'fabric.elements.user-picker.member.lozenge.text',
121
126
  defaultMessage: 'MEMBER',
@@ -2,7 +2,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
2
2
  import { v4 as uuidv4 } from 'uuid';
3
3
  import { isCustom, isExternalUser } from './components/utils';
4
4
  const packageName = "@atlaskit/user-picker";
5
- const packageVersion = "11.4.3";
5
+ const packageVersion = "11.5.0";
6
6
  const UUID_REGEXP_TEAMS_GROUPS = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
7
7
  const UUID_REGEXP_OLD_AAID = /^[a-fA-F0-9]{1,8}:[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
8
8
  const UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;
@@ -8,6 +8,7 @@ import { SlackIcon } from '../assets/slack';
8
8
  import { GoogleIcon } from '../assets/google';
9
9
  import { MicrosoftIcon } from '../assets/microsoft';
10
10
  import { messages } from '../i18n';
11
+ import { fg } from '@atlaskit/platform-feature-flags';
11
12
  const sourcesTooltipContainer = xcss({
12
13
  paddingBottom: 'space.050',
13
14
  paddingRight: 'space.050'
@@ -17,6 +18,37 @@ const sourceWrapperStyles = xcss({
17
18
  display: 'flex',
18
19
  alignItems: 'center'
19
20
  });
21
+ const SUPPORTED_SOURCES_APPIFY = [{
22
+ sourceType: 'jira',
23
+ icon: /*#__PURE__*/React.createElement(JiraIcon, {
24
+ size: 'xxsmall'
25
+ }),
26
+ label: messages.jiraSource
27
+ }, {
28
+ sourceType: 'confluence',
29
+ icon: /*#__PURE__*/React.createElement(ConfluenceIcon, {
30
+ size: 'xxsmall'
31
+ }),
32
+ label: messages.confluenceSource
33
+ }, {
34
+ sourceType: 'other-atlassian',
35
+ icon: /*#__PURE__*/React.createElement(AtlassianIcon, {
36
+ size: 'xxsmall'
37
+ }),
38
+ label: messages.otherAtlassianSourceAppify
39
+ }, {
40
+ sourceType: 'slack',
41
+ icon: /*#__PURE__*/React.createElement(SlackIcon, null),
42
+ label: messages.slackProvider
43
+ }, {
44
+ sourceType: 'google',
45
+ icon: /*#__PURE__*/React.createElement(GoogleIcon, null),
46
+ label: messages.googleProvider
47
+ }, {
48
+ sourceType: 'microsoft',
49
+ icon: /*#__PURE__*/React.createElement(MicrosoftIcon, null),
50
+ label: messages.microsoftProvider
51
+ }];
20
52
  const SUPPORTED_SOURCES = [{
21
53
  sourceType: 'jira',
22
54
  icon: /*#__PURE__*/React.createElement(JiraIcon, {
@@ -60,7 +92,7 @@ export const SourcesTooltipContent = ({
60
92
  sources,
61
93
  sourcesLoading
62
94
  }) => {
63
- const sourcesToRender = React.useMemo(() => SUPPORTED_SOURCES.filter(supportedSource => sources.includes(supportedSource.sourceType)), [sources]);
95
+ const sourcesToRender = React.useMemo(() => fg('product-terminology-refresh') ? SUPPORTED_SOURCES_APPIFY.filter(supportedSource => sources.includes(supportedSource.sourceType)) : SUPPORTED_SOURCES.filter(supportedSource => sources.includes(supportedSource.sourceType)), [sources]);
64
96
  return /*#__PURE__*/React.createElement(React.Fragment, null, !sourcesLoading && sources.length === 0 ? /*#__PURE__*/React.createElement(Box, {
65
97
  as: "span"
66
98
  }, /*#__PURE__*/React.createElement(FormattedMessage, messages.externalUserSourcesError)) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Box, {
@@ -110,6 +110,11 @@ export const messages = defineMessages({
110
110
  defaultMessage: 'Other Atlassian products',
111
111
  description: 'This external user is sourced from Atlassian products other than Jira and Confluence'
112
112
  },
113
+ otherAtlassianSourceAppify: {
114
+ id: 'fabric.elements.user-picker.source.other-atlassian-appify',
115
+ defaultMessage: 'Other Atlassian apps',
116
+ description: 'This external user is sourced from Atlassian products other than Jira and Confluence'
117
+ },
113
118
  memberLozengeText: {
114
119
  id: 'fabric.elements.user-picker.member.lozenge.text',
115
120
  defaultMessage: 'MEMBER',
@@ -5,7 +5,7 @@ import { createAndFireEvent } from '@atlaskit/analytics-next';
5
5
  import { v4 as uuidv4 } from 'uuid';
6
6
  import { isCustom, isExternalUser } from './components/utils';
7
7
  var packageName = "@atlaskit/user-picker";
8
- var packageVersion = "11.4.3";
8
+ var packageVersion = "11.5.0";
9
9
  var UUID_REGEXP_TEAMS_GROUPS = /^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
10
10
  var UUID_REGEXP_OLD_AAID = /^[a-fA-F0-9]{1,8}:[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$/;
11
11
  var UUID_REGEXP_NEW_AAID = /^[a-fA-F0-9]{24,24}$/;
@@ -8,6 +8,7 @@ import { SlackIcon } from '../assets/slack';
8
8
  import { GoogleIcon } from '../assets/google';
9
9
  import { MicrosoftIcon } from '../assets/microsoft';
10
10
  import { messages } from '../i18n';
11
+ import { fg } from '@atlaskit/platform-feature-flags';
11
12
  var sourcesTooltipContainer = xcss({
12
13
  paddingBottom: 'space.050',
13
14
  paddingRight: 'space.050'
@@ -17,6 +18,37 @@ var sourceWrapperStyles = xcss({
17
18
  display: 'flex',
18
19
  alignItems: 'center'
19
20
  });
21
+ var SUPPORTED_SOURCES_APPIFY = [{
22
+ sourceType: 'jira',
23
+ icon: /*#__PURE__*/React.createElement(JiraIcon, {
24
+ size: 'xxsmall'
25
+ }),
26
+ label: messages.jiraSource
27
+ }, {
28
+ sourceType: 'confluence',
29
+ icon: /*#__PURE__*/React.createElement(ConfluenceIcon, {
30
+ size: 'xxsmall'
31
+ }),
32
+ label: messages.confluenceSource
33
+ }, {
34
+ sourceType: 'other-atlassian',
35
+ icon: /*#__PURE__*/React.createElement(AtlassianIcon, {
36
+ size: 'xxsmall'
37
+ }),
38
+ label: messages.otherAtlassianSourceAppify
39
+ }, {
40
+ sourceType: 'slack',
41
+ icon: /*#__PURE__*/React.createElement(SlackIcon, null),
42
+ label: messages.slackProvider
43
+ }, {
44
+ sourceType: 'google',
45
+ icon: /*#__PURE__*/React.createElement(GoogleIcon, null),
46
+ label: messages.googleProvider
47
+ }, {
48
+ sourceType: 'microsoft',
49
+ icon: /*#__PURE__*/React.createElement(MicrosoftIcon, null),
50
+ label: messages.microsoftProvider
51
+ }];
20
52
  var SUPPORTED_SOURCES = [{
21
53
  sourceType: 'jira',
22
54
  icon: /*#__PURE__*/React.createElement(JiraIcon, {
@@ -60,7 +92,9 @@ export var SourcesTooltipContent = function SourcesTooltipContent(_ref) {
60
92
  var sources = _ref.sources,
61
93
  sourcesLoading = _ref.sourcesLoading;
62
94
  var sourcesToRender = React.useMemo(function () {
63
- return SUPPORTED_SOURCES.filter(function (supportedSource) {
95
+ return fg('product-terminology-refresh') ? SUPPORTED_SOURCES_APPIFY.filter(function (supportedSource) {
96
+ return sources.includes(supportedSource.sourceType);
97
+ }) : SUPPORTED_SOURCES.filter(function (supportedSource) {
64
98
  return sources.includes(supportedSource.sourceType);
65
99
  });
66
100
  }, [sources]);
@@ -110,6 +110,11 @@ export var messages = defineMessages({
110
110
  defaultMessage: 'Other Atlassian products',
111
111
  description: 'This external user is sourced from Atlassian products other than Jira and Confluence'
112
112
  },
113
+ otherAtlassianSourceAppify: {
114
+ id: 'fabric.elements.user-picker.source.other-atlassian-appify',
115
+ defaultMessage: 'Other Atlassian apps',
116
+ description: 'This external user is sourced from Atlassian products other than Jira and Confluence'
117
+ },
113
118
  memberLozengeText: {
114
119
  id: 'fabric.elements.user-picker.member.lozenge.text',
115
120
  defaultMessage: 'MEMBER',
@@ -109,6 +109,11 @@ export declare const messages: {
109
109
  defaultMessage: string;
110
110
  description: string;
111
111
  };
112
+ otherAtlassianSourceAppify: {
113
+ id: string;
114
+ defaultMessage: string;
115
+ description: string;
116
+ };
112
117
  memberLozengeText: {
113
118
  id: string;
114
119
  defaultMessage: string;
@@ -109,6 +109,11 @@ export declare const messages: {
109
109
  defaultMessage: string;
110
110
  description: string;
111
111
  };
112
+ otherAtlassianSourceAppify: {
113
+ id: string;
114
+ defaultMessage: string;
115
+ description: string;
116
+ };
112
117
  memberLozengeText: {
113
118
  id: string;
114
119
  defaultMessage: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/user-picker",
3
- "version": "11.5.0",
3
+ "version": "11.6.0",
4
4
  "description": "Fabric component for display a dropdown to select a user from",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -115,6 +115,9 @@
115
115
  },
116
116
  "twcg-444-invite-usd-improvements-m2-gate": {
117
117
  "type": "boolean"
118
+ },
119
+ "product-terminology-refresh": {
120
+ "type": "boolean"
118
121
  }
119
122
  }
120
123
  }