@atlaskit/link-datasource 4.27.4 → 4.28.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 4.28.0
+
+### Minor Changes
+
+- [`6cb21d13010a3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6cb21d13010a3) -
+  [ux] Description field of a Jira SLLV now supports rich text when backend sends `html` property in
+  the data.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.27.4
 
 ### Patch Changes

package/dist/cjs/ui/issue-like-table/render-type/index.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.stringifyType = exports.renderType = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _boolean = _interopRequireDefault(require("./boolean"));
 var _dateTime = _interopRequireWildcard(require("./date-time"));
 var _icon = _interopRequireDefault(require("./icon"));
@@ -44,8 +45,12 @@ var stringifyType = exports.stringifyType = function stringifyType(_ref, formatM
     case 'user':
       return (value === null || value === void 0 ? void 0 : value.displayName) || formatMessage(_messages.userTypeMessages.userDefaultdisplayNameValue);
     case 'richtext':
-      var adfPlainText = (0, _richtext.parseRichText)(value);
-      return adfPlainText || '';
+      if (value.html && value.html.trim() !== '' && (0, _platformFeatureFlags.fg)('platform_navx_jira_sllv_rich_text_gate')) {
+        return '';
+      } else {
+        var adfPlainText = (0, _richtext.parseRichText)(value);
+        return adfPlainText || '';
+      }
     case 'link':
     default:
       return '';

package/dist/cjs/ui/issue-like-table/render-type/richtext/index.compiled.css

@@ -1 +1,2 @@
+._80om73ad{cursor:default}
 ._kqswh2mm{position:relative}

package/dist/cjs/ui/issue-like-table/render-type/richtext/index.js

@@ -13,8 +13,10 @@ var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _dompurify = _interopRequireDefault(require("dompurify"));
 var _schemaDefault = require("@atlaskit/adf-schema/schema-default");
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 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) { (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; }
@@ -53,10 +55,20 @@ var RichTextType = function RichTextType(_ref) {
   var adfPlainText = (0, _react.useMemo)(function () {
     return parseRichText(value);
   }, [value]);
+  if (value.html && value.html.trim() !== '' && (0, _platformFeatureFlags.fg)('platform_navx_jira_sllv_rich_text_gate')) {
+    // eslint-disable-next-line react/no-danger
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testid": "datasource-richtext-html-content",
+      dangerouslySetInnerHTML: {
+        __html: _dompurify.default.sanitize(value.html)
+      },
+      className: (0, _runtime.ax)(["_kqswh2mm _80om73ad"])
+    });
+  }
   if (adfPlainText) {
     return /*#__PURE__*/React.createElement("span", {
       "data-testid": "richtext-plaintext",
-      className: (0, _runtime.ax)(["_kqswh2mm"])
+      className: (0, _runtime.ax)(["_kqswh2mm _80om73ad"])
     }, adfPlainText);
   } else {
     return /*#__PURE__*/React.createElement("span", {

package/dist/es2019/ui/issue-like-table/render-type/index.js

@@ -1,5 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import BooleanRenderType from './boolean';
 import DateTimeRenderType, { getFormattedDate } from './date-time';
 import IconRenderType from './icon';
@@ -36,8 +37,12 @@ export const stringifyType = ({
     case 'user':
       return (value === null || value === void 0 ? void 0 : value.displayName) || formatMessage(userTypeMessages.userDefaultdisplayNameValue);
     case 'richtext':
-      const adfPlainText = parseRichText(value);
-      return adfPlainText || '';
+      if (value.html && value.html.trim() !== '' && fg('platform_navx_jira_sllv_rich_text_gate')) {
+        return '';
+      } else {
+        const adfPlainText = parseRichText(value);
+        return adfPlainText || '';
+      }
     case 'link':
     default:
       return '';

package/dist/es2019/ui/issue-like-table/render-type/richtext/index.compiled.css

@@ -1 +1,2 @@
+._80om73ad{cursor:default}
 ._kqswh2mm{position:relative}

package/dist/es2019/ui/issue-like-table/render-type/richtext/index.js

@@ -3,8 +3,10 @@ import "./index.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useMemo } from 'react';
+import dompurify from 'dompurify';
 import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
 import { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
+import { fg } from '@atlaskit/platform-feature-flags';
 const rootStyles = null;
 const smartLinkNodeToUrl = node => {
   var _node$attrs$url;
@@ -43,10 +45,20 @@ const RichTextType = ({
   value
 }) => {
   const adfPlainText = useMemo(() => parseRichText(value), [value]);
+  if (value.html && value.html.trim() !== '' && fg('platform_navx_jira_sllv_rich_text_gate')) {
+    // eslint-disable-next-line react/no-danger
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testid": "datasource-richtext-html-content",
+      dangerouslySetInnerHTML: {
+        __html: dompurify.sanitize(value.html)
+      },
+      className: ax(["_kqswh2mm _80om73ad"])
+    });
+  }
   if (adfPlainText) {
     return /*#__PURE__*/React.createElement("span", {
       "data-testid": "richtext-plaintext",
-      className: ax(["_kqswh2mm"])
+      className: ax(["_kqswh2mm _80om73ad"])
     }, adfPlainText);
   } else {
     return /*#__PURE__*/React.createElement("span", {

package/dist/esm/ui/issue-like-table/render-type/index.js

@@ -1,5 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import BooleanRenderType from './boolean';
 import DateTimeRenderType, { getFormattedDate } from './date-time';
 import IconRenderType from './icon';
@@ -35,8 +36,12 @@ export var stringifyType = function stringifyType(_ref, formatMessage, formatDat
     case 'user':
       return (value === null || value === void 0 ? void 0 : value.displayName) || formatMessage(userTypeMessages.userDefaultdisplayNameValue);
     case 'richtext':
-      var adfPlainText = parseRichText(value);
-      return adfPlainText || '';
+      if (value.html && value.html.trim() !== '' && fg('platform_navx_jira_sllv_rich_text_gate')) {
+        return '';
+      } else {
+        var adfPlainText = parseRichText(value);
+        return adfPlainText || '';
+      }
     case 'link':
     default:
       return '';

package/dist/esm/ui/issue-like-table/render-type/richtext/index.compiled.css

@@ -1 +1,2 @@
+._80om73ad{cursor:default}
 ._kqswh2mm{position:relative}

package/dist/esm/ui/issue-like-table/render-type/richtext/index.js

@@ -7,8 +7,10 @@ import { ax, ix } from "@compiled/react/runtime";
 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 { useMemo } from 'react';
+import dompurify from 'dompurify';
 import { defaultSchema } from '@atlaskit/adf-schema/schema-default';
 import { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
+import { fg } from '@atlaskit/platform-feature-flags';
 var rootStyles = null;
 var smartLinkNodeToUrl = function smartLinkNodeToUrl(node) {
   var _node$attrs$url;
@@ -44,10 +46,20 @@ var RichTextType = function RichTextType(_ref) {
   var adfPlainText = useMemo(function () {
     return parseRichText(value);
   }, [value]);
+  if (value.html && value.html.trim() !== '' && fg('platform_navx_jira_sllv_rich_text_gate')) {
+    // eslint-disable-next-line react/no-danger
+    return /*#__PURE__*/React.createElement("div", {
+      "data-testid": "datasource-richtext-html-content",
+      dangerouslySetInnerHTML: {
+        __html: dompurify.sanitize(value.html)
+      },
+      className: ax(["_kqswh2mm _80om73ad"])
+    });
+  }
   if (adfPlainText) {
     return /*#__PURE__*/React.createElement("span", {
       "data-testid": "richtext-plaintext",
-      className: ax(["_kqswh2mm"])
+      className: ax(["_kqswh2mm _80om73ad"])
     }, adfPlainText);
   } else {
     return /*#__PURE__*/React.createElement("span", {

package/dist/types/ui/datasource-table-view/datasourceTableView.d.ts

@@ -1,10 +1,10 @@
 export declare const DatasourceTableView: import("react").ForwardRefExoticComponent<{
     datasourceId: string;
-    parameters: object;
+    parameters: import("@atlaskit/linking-types").DatasourceParameters;
     url?: string;
 } & Partial<Pick<import("../issue-like-table/types").IssueLikeDataTableViewProps, "visibleColumnKeys" | "wrappedColumnKeys" | "columnCustomSizes" | "onColumnResize" | "onVisibleColumnKeysChange" | "onWrappedColumnChange" | "scrollableContainerHeight">> & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;
 export declare const DataSourceTableViewNoSuspense: import("react").ForwardRefExoticComponent<{
     datasourceId: string;
-    parameters: object;
+    parameters: import("@atlaskit/linking-types").DatasourceParameters;
     url?: string;
 } & Partial<Pick<import("../issue-like-table/types").IssueLikeDataTableViewProps, "visibleColumnKeys" | "wrappedColumnKeys" | "columnCustomSizes" | "onColumnResize" | "onVisibleColumnKeysChange" | "onWrappedColumnChange" | "scrollableContainerHeight">> & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;

package/dist/types/ui/datasource-table-view/types.d.ts

@@ -1,9 +1,10 @@
+import type { DatasourceParameters } from '@atlaskit/linking-types';
 import { type IssueLikeDataTableViewProps } from '../issue-like-table/types';
 export type DatasourceTableViewProps = {
     /** Unique identifier for which type of datasource is being rendered and for making its requests */
     datasourceId: string;
     /** Parameters for making the data requests necessary to render data within the table */
-    parameters: object;
+    parameters: DatasourceParameters;
     /** Url for an existing datasource, initially used for displaying to a user unauthorized to query that site  */
     url?: string;
 } & Partial<Pick<IssueLikeDataTableViewProps, 'visibleColumnKeys' | 'onVisibleColumnKeysChange' | 'wrappedColumnKeys' | 'onWrappedColumnChange' | 'onColumnResize' | 'columnCustomSizes' | 'scrollableContainerHeight'>>;

package/dist/types-ts4.5/ui/datasource-table-view/datasourceTableView.d.ts

@@ -1,10 +1,10 @@
 export declare const DatasourceTableView: import("react").ForwardRefExoticComponent<{
     datasourceId: string;
-    parameters: object;
+    parameters: import("@atlaskit/linking-types").DatasourceParameters;
     url?: string;
 } & Partial<Pick<import("../issue-like-table/types").IssueLikeDataTableViewProps, "visibleColumnKeys" | "wrappedColumnKeys" | "columnCustomSizes" | "onColumnResize" | "onVisibleColumnKeysChange" | "onWrappedColumnChange" | "scrollableContainerHeight">> & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;
 export declare const DataSourceTableViewNoSuspense: import("react").ForwardRefExoticComponent<{
     datasourceId: string;
-    parameters: object;
+    parameters: import("@atlaskit/linking-types").DatasourceParameters;
     url?: string;
 } & Partial<Pick<import("../issue-like-table/types").IssueLikeDataTableViewProps, "visibleColumnKeys" | "wrappedColumnKeys" | "columnCustomSizes" | "onColumnResize" | "onVisibleColumnKeysChange" | "onWrappedColumnChange" | "scrollableContainerHeight">> & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;

package/dist/types-ts4.5/ui/datasource-table-view/types.d.ts

@@ -1,9 +1,10 @@
+import type { DatasourceParameters } from '@atlaskit/linking-types';
 import { type IssueLikeDataTableViewProps } from '../issue-like-table/types';
 export type DatasourceTableViewProps = {
     /** Unique identifier for which type of datasource is being rendered and for making its requests */
     datasourceId: string;
     /** Parameters for making the data requests necessary to render data within the table */
-    parameters: object;
+    parameters: DatasourceParameters;
     /** Url for an existing datasource, initially used for displaying to a user unauthorized to query that site  */
     url?: string;
 } & Partial<Pick<IssueLikeDataTableViewProps, 'visibleColumnKeys' | 'onVisibleColumnKeysChange' | 'wrappedColumnKeys' | 'onWrappedColumnChange' | 'onColumnResize' | 'columnCustomSizes' | 'scrollableContainerHeight'>>;

package/examples-helpers/buildJiraIssuesTable.tsx

@@ -3,13 +3,12 @@ import React, { useMemo } from 'react';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { SmartCardProvider } from '@atlaskit/link-provider';
 import { mockDatasourceFetchRequests } from '@atlaskit/link-test-helpers/datasource';
-import { type DatasourceParameters } from '@atlaskit/linking-types';
 
 import { type DatasourceTableView } from '../src';
 import { fetchMessagesForLocale } from '../src/common/utils/locale/fetch-messages-for-locale';
 import { DatasourceExperienceIdProvider } from '../src/contexts/datasource-experience-id';
 import { DataSourceTableViewNoSuspense } from '../src/ui/datasource-table-view/datasourceTableView';
-import { type JiraIssueDatasourceParameters } from '../src/ui/jira-issues-modal/types';
+import type { DatasourceTableViewProps } from '../src/ui/datasource-table-view/types';
 
 import SmartLinkClient from './smartLinkCustomClient';
 import { useCommonTableProps } from './useCommonTableProps';
@@ -20,23 +19,26 @@ type JiraIssuesTableViewProps = {
 	 */
 	DatasourceTable?: typeof DataSourceTableViewNoSuspense | typeof DatasourceTableView;
 	mockDatasourceFetchRequest?: boolean;
-	parameters?: DatasourceParameters;
-};
+} & Partial<Pick<DatasourceTableViewProps, 'parameters' | 'scrollableContainerHeight' | 'visibleColumnKeys'>>;
 
 const JiraIssuesTableView = ({
-	parameters,
 	DatasourceTable = DataSourceTableViewNoSuspense,
-}: JiraIssuesTableViewProps) => {
-	const cloudId = parameters?.cloudId || 'some-cloud-id';
-
-	const datasourceParameters = useMemo<JiraIssueDatasourceParameters>(
-		() => ({
-			cloudId,
-			jql: 'some-jql',
-		}),
-		[cloudId],
-	);
-
+	...props
+}: Omit<JiraIssuesTableViewProps, 'mockDatasourceFetchRequest'>) => {
+	const {
+		parameters: {
+			cloudId = 'some-cloud-id',
+			jql = 'some-jql',
+		} = {},
+		scrollableContainerHeight,
+		visibleColumnKeys: initialVisibleColumnKeys,
+	} = props
+	
+	const parameters = useMemo(() => ({
+		cloudId,
+		jql,
+	}), [cloudId, jql]);
+	
 	const {
 		visibleColumnKeys,
 		onVisibleColumnKeysChange,
@@ -51,25 +53,27 @@ const JiraIssuesTableView = ({
 			link: 350,
 			labels: 100,
 			priority: 200,
+			description: 650,
 		},
+		visibleColumnKeys: initialVisibleColumnKeys,
 	});
 
 	return (
 		<DatasourceTable
 			datasourceId={'some-datasource-id'}
-			parameters={datasourceParameters}
+			parameters={parameters}
 			visibleColumnKeys={visibleColumnKeys}
 			onVisibleColumnKeysChange={onVisibleColumnKeysChange}
 			columnCustomSizes={columnCustomSizes}
 			onColumnResize={onColumnResize}
 			onWrappedColumnChange={onWrappedColumnChange}
 			wrappedColumnKeys={wrappedColumnKeys}
+			scrollableContainerHeight={scrollableContainerHeight}
 		/>
 	);
 };
 
 export const ExampleJiraIssuesTableView = ({
-	parameters,
 	mockDatasourceFetchRequest = true,
 	...props
 }: JiraIssuesTableViewProps) => {
@@ -81,7 +85,7 @@ export const ExampleJiraIssuesTableView = ({
 		<DatasourceExperienceIdProvider>
 			<IntlMessagesProvider loaderFn={fetchMessagesForLocale}>
 				<SmartCardProvider client={new SmartLinkClient()}>
-					<JiraIssuesTableView parameters={parameters} {...props} />
+					<JiraIssuesTableView {...props} />
 				</SmartCardProvider>
 			</IntlMessagesProvider>
 		</DatasourceExperienceIdProvider>

package/examples-helpers/useCommonTableProps.tsx

@@ -8,7 +8,7 @@ import type { DatasourceTableViewProps } from '../src/ui/datasource-table-view/t
 import type { ColumnSizesMap } from '../src/ui/issue-like-table/types';
 
 export const useCommonTableProps = (
-	props: { defaultColumnCustomSizes?: ColumnSizesMap } = {},
+	props: { defaultColumnCustomSizes?: ColumnSizesMap, visibleColumnKeys?: string[] } = {},
 ): Required<
 	Pick<
 		DatasourceTableViewProps,
@@ -21,7 +21,7 @@ export const useCommonTableProps = (
 > &
 	Pick<DatasourceTableViewProps, 'columnCustomSizes'> => {
 	const [visibleColumnKeys, onVisibleColumnKeysChange] = useState<string[]>(
-		defaultInitialVisibleJiraColumnKeys,
+		props.visibleColumnKeys ?? defaultInitialVisibleJiraColumnKeys,
 	);
 
 	const { columnCustomSizes, onColumnResize } = useColumnResize(props.defaultColumnCustomSizes);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "4.27.4",
+	"version": "4.28.0",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -59,7 +59,7 @@
 		"@atlaskit/inline-edit": "^15.3.0",
 		"@atlaskit/intl-messages-provider": "^2.0.0",
 		"@atlaskit/jql-ast": "^3.3.0",
-		"@atlaskit/jql-editor": "^5.7.0",
+		"@atlaskit/jql-editor": "^5.8.0",
 		"@atlaskit/jql-editor-autocomplete-rest": "^3.0.0",
 		"@atlaskit/layering": "^3.2.0",
 		"@atlaskit/link": "^3.2.0",
@@ -71,27 +71,29 @@
 		"@atlaskit/modal-dialog": "^14.6.0",
 		"@atlaskit/outbound-auth-flow-client": "^3.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/popup": "^4.4.0",
+		"@atlaskit/popup": "^4.6.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^2.0.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
-		"@atlaskit/primitives": "^16.0.0",
+		"@atlaskit/primitives": "^16.1.0",
 		"@atlaskit/react-select": "^3.8.0",
 		"@atlaskit/select": "^21.3.0",
-		"@atlaskit/smart-card": "^43.4.0",
+		"@atlaskit/smart-card": "^43.5.0",
 		"@atlaskit/smart-user-picker": "^8.4.0",
 		"@atlaskit/spinner": "^19.0.0",
 		"@atlaskit/tag": "^14.1.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tokens": "^7.0.0",
-		"@atlaskit/tooltip": "^20.6.0",
+		"@atlaskit/tokens": "^7.1.0",
+		"@atlaskit/tooltip": "^20.7.0",
 		"@atlaskit/ufo": "^0.4.0",
 		"@atlaskit/width-detector": "^5.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.6",
+		"@types/dompurify": "^2.2.3",
 		"debounce-promise": "^3.1.2",
+		"dompurify": "^2.5.6",
 		"lodash": "^4.17.21",
 		"react-sweet-state": "^2.6.5",
 		"tiny-invariant": "^1.2.0",
@@ -190,6 +192,9 @@
 		},
 		"navx-1845-sllv-autofocus-first-interactive-element": {
 			"type": "boolean"
+		},
+		"platform_navx_jira_sllv_rich_text_gate": {
+			"type": "boolean"
 		}
 	},
 	"compassUnitTestMetricSourceId": "ari:cloud:compass:a436116f-02ce-4520-8fbb-7301462a1674:metric-source/c5751cc6-3513-4070-9deb-af31e86aed34/9c893299-a527-4457-9b46-f3bc4c828766"