@atlaskit/smart-card 32.0.0 → 32.1.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.
Files changed (15) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/extractors/common/lozenge/extractLozenge.js +24 -5
  3. package/dist/cjs/utils/analytics/analytics.js +1 -1
  4. package/dist/cjs/view/LinkUrl/index.js +1 -1
  5. package/dist/es2019/extractors/common/lozenge/extractLozenge.js +19 -0
  6. package/dist/es2019/utils/analytics/analytics.js +1 -1
  7. package/dist/es2019/view/LinkUrl/index.js +1 -1
  8. package/dist/esm/extractors/common/lozenge/extractLozenge.js +24 -5
  9. package/dist/esm/utils/analytics/analytics.js +1 -1
  10. package/dist/esm/view/LinkUrl/index.js +1 -1
  11. package/dist/types/extractors/common/lozenge/extractState.d.ts +2 -3
  12. package/dist/types/extractors/common/lozenge/types.d.ts +2 -0
  13. package/dist/types-ts4.5/extractors/common/lozenge/extractState.d.ts +2 -3
  14. package/dist/types-ts4.5/extractors/common/lozenge/types.d.ts +2 -0
  15. package/package.json +7 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/smart-card
2
2
 
3
+ ## 32.1.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#170211](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/170211)
8
+ [`c2506e15d813c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c2506e15d813c) -
9
+ Smart card to always show lozenge if `atlassian:state` exists, regardless of json ld type
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies
14
+
3
15
  ## 32.0.0
4
16
 
5
17
  ### Major Changes
package/dist/cjs/extractors/common/lozenge/extractLozenge.js CHANGED
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.extractLozenge = void 0;
7
7
  var _linkExtractors = require("@atlaskit/link-extractors");
8
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
8
9
  var _extractState = require("./extractState");
9
10
  var _extractTag = require("./extractTag");
10
11
  var _extractTaskStatus = require("./extractTaskStatus");
@@ -13,14 +14,32 @@ var DOC_TYPES = ['schema:BlogPosting', 'schema:TextDigitalDocument', 'schema:Dig
13
14
  var extractLozenge = exports.extractLozenge = function extractLozenge(jsonLd) {
14
15
  var type = (0, _linkExtractors.extractType)(jsonLd);
15
16
  if (type) {
17
+ if ((0, _platformFeatureFlags.fg)('linking_platform_show_lozenge_atlassian_state')) {
18
+ if (type.includes('atlassian:Task')) {
19
+ var jsonLdTask = jsonLd;
20
+ var lozengeFromTag = (0, _extractTag.extractTag)(jsonLdTask);
21
+ var lozengeFromStatus = (0, _extractTaskStatus.extractTaskStatus)(jsonLdTask);
22
+ var lozengeFromTaskType = extractLozengeFromTaskType(jsonLdTask);
23
+ return lozengeFromTag || lozengeFromStatus || lozengeFromTaskType;
24
+ }
25
+ if (type.includes('atlassian:UndefinedLink')) {
26
+ return {
27
+ text: 'UNDEFINED',
28
+ appearance: 'inprogress'
29
+ };
30
+ }
31
+
32
+ // casting it because `extractState` can safely handle missing properties
33
+ return (0, _extractState.extractState)(jsonLd);
34
+ }
16
35
  if (type.includes('atlassian:SourceCodePullRequest')) {
17
36
  return (0, _extractState.extractState)(jsonLd);
18
37
  } else if (type.includes('atlassian:Task')) {
19
- var jsonLdTask = jsonLd;
20
- var lozengeFromTag = (0, _extractTag.extractTag)(jsonLdTask);
21
- var lozengeFromStatus = (0, _extractTaskStatus.extractTaskStatus)(jsonLdTask);
22
- var lozengeFromTaskType = extractLozengeFromTaskType(jsonLdTask);
23
- return lozengeFromTag || lozengeFromStatus || lozengeFromTaskType;
38
+ var _jsonLdTask = jsonLd;
39
+ var _lozengeFromTag = (0, _extractTag.extractTag)(_jsonLdTask);
40
+ var _lozengeFromStatus = (0, _extractTaskStatus.extractTaskStatus)(_jsonLdTask);
41
+ var _lozengeFromTaskType = extractLozengeFromTaskType(_jsonLdTask);
42
+ return _lozengeFromTag || _lozengeFromStatus || _lozengeFromTaskType;
24
43
  } else if (type.some(function (types) {
25
44
  return DOC_TYPES.includes(types);
26
45
  })) {
package/dist/cjs/utils/analytics/analytics.js CHANGED
@@ -17,7 +17,7 @@ var ANALYTICS_CHANNEL = exports.ANALYTICS_CHANNEL = 'media';
17
17
  var context = exports.context = {
18
18
  componentName: 'smart-cards',
19
19
  packageName: "@atlaskit/smart-card",
20
- packageVersion: "32.0.0"
20
+ packageVersion: "32.1.0"
21
21
  };
22
22
  var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
23
23
  TrackQuickActionType["StatusUpdate"] = "StatusUpdate";
package/dist/cjs/view/LinkUrl/index.js CHANGED
@@ -17,7 +17,7 @@ var _excluded = ["href", "children", "checkSafety", "onClick", "testId"],
17
17
  _excluded2 = ["isLinkSafe", "showSafetyWarningModal"];
18
18
  var PACKAGE_DATA = {
19
19
  packageName: "@atlaskit/smart-card",
20
- packageVersion: "32.0.0",
20
+ packageVersion: "32.1.0",
21
21
  componentName: 'linkUrl'
22
22
  };
23
23
  var Link = (0, _click.withLinkClickedEvent)('a');
package/dist/es2019/extractors/common/lozenge/extractLozenge.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { extractType } from '@atlaskit/link-extractors';
2
+ import { fg } from '@atlaskit/platform-feature-flags';
2
3
  import { extractState } from './extractState';
3
4
  import { extractTag } from './extractTag';
4
5
  import { extractTaskStatus } from './extractTaskStatus';
@@ -7,6 +8,24 @@ const DOC_TYPES = ['schema:BlogPosting', 'schema:TextDigitalDocument', 'schema:D
7
8
  export const extractLozenge = jsonLd => {
8
9
  const type = extractType(jsonLd);
9
10
  if (type) {
11
+ if (fg('linking_platform_show_lozenge_atlassian_state')) {
12
+ if (type.includes('atlassian:Task')) {
13
+ const jsonLdTask = jsonLd;
14
+ const lozengeFromTag = extractTag(jsonLdTask);
15
+ const lozengeFromStatus = extractTaskStatus(jsonLdTask);
16
+ const lozengeFromTaskType = extractLozengeFromTaskType(jsonLdTask);
17
+ return lozengeFromTag || lozengeFromStatus || lozengeFromTaskType;
18
+ }
19
+ if (type.includes('atlassian:UndefinedLink')) {
20
+ return {
21
+ text: 'UNDEFINED',
22
+ appearance: 'inprogress'
23
+ };
24
+ }
25
+
26
+ // casting it because `extractState` can safely handle missing properties
27
+ return extractState(jsonLd);
28
+ }
10
29
  if (type.includes('atlassian:SourceCodePullRequest')) {
11
30
  return extractState(jsonLd);
12
31
  } else if (type.includes('atlassian:Task')) {
package/dist/es2019/utils/analytics/analytics.js CHANGED
@@ -4,7 +4,7 @@ export const ANALYTICS_CHANNEL = 'media';
4
4
  export const context = {
5
5
  componentName: 'smart-cards',
6
6
  packageName: "@atlaskit/smart-card",
7
- packageVersion: "32.0.0"
7
+ packageVersion: "32.1.0"
8
8
  };
9
9
  export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
10
10
  TrackQuickActionType["StatusUpdate"] = "StatusUpdate";
package/dist/es2019/view/LinkUrl/index.js CHANGED
@@ -7,7 +7,7 @@ import LinkWarningModal from './LinkWarningModal';
7
7
  import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-modal';
8
8
  const PACKAGE_DATA = {
9
9
  packageName: "@atlaskit/smart-card",
10
- packageVersion: "32.0.0",
10
+ packageVersion: "32.1.0",
11
11
  componentName: 'linkUrl'
12
12
  };
13
13
  const Link = withLinkClickedEvent('a');
package/dist/esm/extractors/common/lozenge/extractLozenge.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { extractType } from '@atlaskit/link-extractors';
2
+ import { fg } from '@atlaskit/platform-feature-flags';
2
3
  import { extractState } from './extractState';
3
4
  import { extractTag } from './extractTag';
4
5
  import { extractTaskStatus } from './extractTaskStatus';
@@ -7,14 +8,32 @@ var DOC_TYPES = ['schema:BlogPosting', 'schema:TextDigitalDocument', 'schema:Dig
7
8
  export var extractLozenge = function extractLozenge(jsonLd) {
8
9
  var type = extractType(jsonLd);
9
10
  if (type) {
11
+ if (fg('linking_platform_show_lozenge_atlassian_state')) {
12
+ if (type.includes('atlassian:Task')) {
13
+ var jsonLdTask = jsonLd;
14
+ var lozengeFromTag = extractTag(jsonLdTask);
15
+ var lozengeFromStatus = extractTaskStatus(jsonLdTask);
16
+ var lozengeFromTaskType = extractLozengeFromTaskType(jsonLdTask);
17
+ return lozengeFromTag || lozengeFromStatus || lozengeFromTaskType;
18
+ }
19
+ if (type.includes('atlassian:UndefinedLink')) {
20
+ return {
21
+ text: 'UNDEFINED',
22
+ appearance: 'inprogress'
23
+ };
24
+ }
25
+
26
+ // casting it because `extractState` can safely handle missing properties
27
+ return extractState(jsonLd);
28
+ }
10
29
  if (type.includes('atlassian:SourceCodePullRequest')) {
11
30
  return extractState(jsonLd);
12
31
  } else if (type.includes('atlassian:Task')) {
13
- var jsonLdTask = jsonLd;
14
- var lozengeFromTag = extractTag(jsonLdTask);
15
- var lozengeFromStatus = extractTaskStatus(jsonLdTask);
16
- var lozengeFromTaskType = extractLozengeFromTaskType(jsonLdTask);
17
- return lozengeFromTag || lozengeFromStatus || lozengeFromTaskType;
32
+ var _jsonLdTask = jsonLd;
33
+ var _lozengeFromTag = extractTag(_jsonLdTask);
34
+ var _lozengeFromStatus = extractTaskStatus(_jsonLdTask);
35
+ var _lozengeFromTaskType = extractLozengeFromTaskType(_jsonLdTask);
36
+ return _lozengeFromTag || _lozengeFromStatus || _lozengeFromTaskType;
18
37
  } else if (type.some(function (types) {
19
38
  return DOC_TYPES.includes(types);
20
39
  })) {
package/dist/esm/utils/analytics/analytics.js CHANGED
@@ -10,7 +10,7 @@ export var ANALYTICS_CHANNEL = 'media';
10
10
  export var context = {
11
11
  componentName: 'smart-cards',
12
12
  packageName: "@atlaskit/smart-card",
13
- packageVersion: "32.0.0"
13
+ packageVersion: "32.1.0"
14
14
  };
15
15
  export var TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
16
16
  TrackQuickActionType["StatusUpdate"] = "StatusUpdate";
package/dist/esm/view/LinkUrl/index.js CHANGED
@@ -10,7 +10,7 @@ import LinkWarningModal from './LinkWarningModal';
10
10
  import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-modal';
11
11
  var PACKAGE_DATA = {
12
12
  packageName: "@atlaskit/smart-card",
13
- packageVersion: "32.0.0",
13
+ packageVersion: "32.1.0",
14
14
  componentName: 'linkUrl'
15
15
  };
16
16
  var Link = withLinkClickedEvent('a');
package/dist/types/extractors/common/lozenge/extractState.d.ts CHANGED
@@ -1,3 +1,2 @@
1
- import { type JsonLd } from 'json-ld-types';
2
- import { type LinkLozenge } from './types';
3
- export declare const extractState: (jsonLd: JsonLd.Data.SourceCodePullRequest | JsonLd.Data.Document | JsonLd.Data.Project | JsonLd.Data.Goal) => LinkLozenge | undefined;
1
+ import { type LinkLozenge, type LinkStateType } from './types';
2
+ export declare const extractState: (jsonLd: LinkStateType) => LinkLozenge | undefined;
package/dist/types/extractors/common/lozenge/types.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { type JsonLd } from 'json-ld-types';
1
2
  import { type LozengeProps as AtlaskitLozengeProps } from '@atlaskit/lozenge';
2
3
  import { type InvokeActions } from '../../../state/hooks/use-invoke/types';
3
4
  export type LinkLozengeColor = 'default' | 'success' | 'removed' | 'inprogress' | 'new' | 'moved';
@@ -12,3 +13,4 @@ export interface LinkLozenge {
12
13
  export type LinkDocumentState = 'archived' | 'draft' | 'current';
13
14
  export type LinkPullRequestState = 'open' | 'merged' | 'declined' | 'closed';
14
15
  export type LinkState = LinkDocumentState & LinkPullRequestState;
16
+ export type LinkStateType = JsonLd.Data.Document | JsonLd.Data.SourceCodePullRequest | JsonLd.Data.Project | JsonLd.Data.Goal;
package/dist/types-ts4.5/extractors/common/lozenge/extractState.d.ts CHANGED
@@ -1,3 +1,2 @@
1
- import { type JsonLd } from 'json-ld-types';
2
- import { type LinkLozenge } from './types';
3
- export declare const extractState: (jsonLd: JsonLd.Data.SourceCodePullRequest | JsonLd.Data.Document | JsonLd.Data.Project | JsonLd.Data.Goal) => LinkLozenge | undefined;
1
+ import { type LinkLozenge, type LinkStateType } from './types';
2
+ export declare const extractState: (jsonLd: LinkStateType) => LinkLozenge | undefined;
package/dist/types-ts4.5/extractors/common/lozenge/types.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { type JsonLd } from 'json-ld-types';
1
2
  import { type LozengeProps as AtlaskitLozengeProps } from '@atlaskit/lozenge';
2
3
  import { type InvokeActions } from '../../../state/hooks/use-invoke/types';
3
4
  export type LinkLozengeColor = 'default' | 'success' | 'removed' | 'inprogress' | 'new' | 'moved';
@@ -12,3 +13,4 @@ export interface LinkLozenge {
12
13
  export type LinkDocumentState = 'archived' | 'draft' | 'current';
13
14
  export type LinkPullRequestState = 'open' | 'merged' | 'declined' | 'closed';
14
15
  export type LinkState = LinkDocumentState & LinkPullRequestState;
16
+ export type LinkStateType = JsonLd.Data.Document | JsonLd.Data.SourceCodePullRequest | JsonLd.Data.Project | JsonLd.Data.Goal;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/smart-card",
3
- "version": "32.0.0",
3
+ "version": "32.1.0",
4
4
  "description": "Smart card component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -33,10 +33,10 @@
33
33
  "@atlaskit/button": "^20.3.0",
34
34
  "@atlaskit/checkbox": "^15.2.0",
35
35
  "@atlaskit/dropdown-menu": "^12.23.0",
36
- "@atlaskit/form": "^10.5.0",
36
+ "@atlaskit/form": "^10.6.0",
37
37
  "@atlaskit/frontend-utilities": "^2.7.0",
38
38
  "@atlaskit/heading": "^3.1.0",
39
- "@atlaskit/icon": "^22.26.0",
39
+ "@atlaskit/icon": "^22.27.0",
40
40
  "@atlaskit/icon-file-type": "^6.7.0",
41
41
  "@atlaskit/icon-object": "^6.7.0",
42
42
  "@atlaskit/icon-priority": "^6.3.0",
@@ -60,7 +60,7 @@
60
60
  "@atlaskit/textarea": "^5.6.0",
61
61
  "@atlaskit/textfield": "^6.6.0",
62
62
  "@atlaskit/theme": "^14.0.0",
63
- "@atlaskit/tokens": "^2.3.0",
63
+ "@atlaskit/tokens": "^2.4.0",
64
64
  "@atlaskit/tooltip": "^18.9.0",
65
65
  "@atlaskit/ufo": "^0.3.0",
66
66
  "@babel/runtime": "^7.0.0",
@@ -171,6 +171,9 @@
171
171
  "platform-visual-refresh-icons": {
172
172
  "type": "boolean"
173
173
  },
174
+ "linking_platform_show_lozenge_atlassian_state": {
175
+ "type": "boolean"
176
+ },
174
177
  "smart_links_for_plans_platform": {
175
178
  "type": "boolean"
176
179
  },