@atlaskit/link-datasource 3.8.3 → 3.8.5

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/link-datasource
 
+## 3.8.5
+
+### Patch Changes
+
+- [#158223](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/158223)
+  [`ab22f74a91062`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ab22f74a91062) -
+  The change here adds an optional `text` property for the Datasource Icon type.
+- Updated dependencies
+
+## 3.8.4
+
+### Patch Changes
+
+- [#161257](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/161257)
+  [`085902303c5ee`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/085902303c5ee) -
+  Fixes how we pass input params to executeFetchAction - behind ff
+
 ## 3.8.3
 
 ### Patch Changes

package/dist/cjs/state/actions/index.js

@@ -179,7 +179,6 @@ var getFieldUpdateActionByAri = function getFieldUpdateActionByAri(state, _ref4)
 var useAtomicUpdateActionSchema = exports.useAtomicUpdateActionSchema = (0, _reactSweetState.createHook)(ActionsStore, {
   selector: getFieldUpdateActionByAri
 });
-
 /**
  * Given an ARI + fieldKey + integrationKey
  * Returns an executable action that updates a field on the entity if the user has permissions to do so

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
@@ -97,7 +96,7 @@ var loadOptions = /*#__PURE__*/function () {
             break;
           }
           _context.next = 3;
-          return executeFetch((0, _defineProperty2.default)({}, currentValue.type, currentValue.values[0]));
+          return executeFetch({});
         case 3:
           result = _context.sent;
           operationStatus = result.operationStatus, entities = result.entities;

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

@@ -4,9 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.ICON_TYPE_TEST_ID = void 0;
+exports.default = exports.ICON_TYPE_TEXT_TEST_ID = exports.ICON_TYPE_TEST_ID = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _primitives = require("@atlaskit/primitives");
+var _text = _interopRequireDefault(require("../text"));
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
@@ -15,9 +17,17 @@ var IconWrapper = _styled.default.div({
   alignItems: 'center',
   justifyContent: 'left'
 });
+var textWrapperStyles = (0, _primitives.xcss)({
+  marginLeft: 'space.100',
+  overflow: 'hidden',
+  textOverflow: 'ellipsis',
+  whiteSpace: 'nowrap'
+});
 var ICON_TYPE_TEST_ID = exports.ICON_TYPE_TEST_ID = 'link-datasource-render-type--icon';
+var ICON_TYPE_TEXT_TEST_ID = exports.ICON_TYPE_TEXT_TEST_ID = "".concat(ICON_TYPE_TEST_ID, "-text");
 var IconRenderType = function IconRenderType(_ref) {
   var label = _ref.label,
+    text = _ref.text,
     source = _ref.source,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? ICON_TYPE_TEST_ID : _ref$testId;
@@ -31,6 +41,11 @@ var IconRenderType = function IconRenderType(_ref) {
       minWidth: '20px',
       maxWidth: '20px'
     } // having just width: '20px' shrinks it when table width is reduced
-  }));
+  }), text && /*#__PURE__*/_react.default.createElement(_primitives.Box, {
+    xcss: textWrapperStyles
+  }, /*#__PURE__*/_react.default.createElement(_text.default, {
+    testId: ICON_TYPE_TEXT_TEST_ID,
+    text: text
+  })));
 };
 var _default = exports.default = IconRenderType;

package/dist/es2019/state/actions/index.js

@@ -161,7 +161,6 @@ const getFieldUpdateActionByAri = (state, {
 export const useAtomicUpdateActionSchema = createHook(ActionsStore, {
   selector: getFieldUpdateActionByAri
 });
-
 /**
  * Given an ARI + fieldKey + integrationKey
  * Returns an executable action that updates a field on the entity if the user has permissions to do so

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

@@ -67,9 +67,7 @@ const useStatusOptions = (currentValue, executeFetch) => {
 };
 const loadOptions = async (currentValue, executeFetch) => {
   if (executeFetch) {
-    const result = await executeFetch({
-      [currentValue.type]: currentValue.values[0]
-    });
+    const result = await executeFetch({});
     const {
       operationStatus,
       entities

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

@@ -2,15 +2,25 @@ import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import styled from '@emotion/styled';
+import { Box, xcss } from '@atlaskit/primitives';
+import TextRenderType from '../text';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
 const IconWrapper = styled.div({
   display: 'flex',
   alignItems: 'center',
   justifyContent: 'left'
 });
+const textWrapperStyles = xcss({
+  marginLeft: 'space.100',
+  overflow: 'hidden',
+  textOverflow: 'ellipsis',
+  whiteSpace: 'nowrap'
+});
 export const ICON_TYPE_TEST_ID = 'link-datasource-render-type--icon';
+export const ICON_TYPE_TEXT_TEST_ID = `${ICON_TYPE_TEST_ID}-text`;
 const IconRenderType = ({
   label,
+  text,
   source,
   testId = ICON_TYPE_TEST_ID
 }) => {
@@ -24,6 +34,11 @@ const IconRenderType = ({
       minWidth: '20px',
       maxWidth: '20px'
     } // having just width: '20px' shrinks it when table width is reduced
-  }));
+  }), text && /*#__PURE__*/React.createElement(Box, {
+    xcss: textWrapperStyles
+  }, /*#__PURE__*/React.createElement(TextRenderType, {
+    testId: ICON_TYPE_TEXT_TEST_ID,
+    text: text
+  })));
 };
 export default IconRenderType;

package/dist/esm/state/actions/index.js

@@ -173,7 +173,6 @@ var getFieldUpdateActionByAri = function getFieldUpdateActionByAri(state, _ref4)
 export var useAtomicUpdateActionSchema = createHook(ActionsStore, {
   selector: getFieldUpdateActionByAri
 });
-
 /**
  * Given an ARI + fieldKey + integrationKey
  * Returns an executable action that updates a field on the entity if the user has permissions to do so

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

@@ -1,4 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _extends from "@babel/runtime/helpers/extends";
@@ -87,7 +86,7 @@ var loadOptions = /*#__PURE__*/function () {
             break;
           }
           _context.next = 3;
-          return executeFetch(_defineProperty({}, currentValue.type, currentValue.values[0]));
+          return executeFetch({});
         case 3:
           result = _context.sent;
           operationStatus = result.operationStatus, entities = result.entities;

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

@@ -2,15 +2,25 @@ import React from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import styled from '@emotion/styled';
+import { Box, xcss } from '@atlaskit/primitives';
+import TextRenderType from '../text';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
 var IconWrapper = styled.div({
   display: 'flex',
   alignItems: 'center',
   justifyContent: 'left'
 });
+var textWrapperStyles = xcss({
+  marginLeft: 'space.100',
+  overflow: 'hidden',
+  textOverflow: 'ellipsis',
+  whiteSpace: 'nowrap'
+});
 export var ICON_TYPE_TEST_ID = 'link-datasource-render-type--icon';
+export var ICON_TYPE_TEXT_TEST_ID = "".concat(ICON_TYPE_TEST_ID, "-text");
 var IconRenderType = function IconRenderType(_ref) {
   var label = _ref.label,
+    text = _ref.text,
     source = _ref.source,
     _ref$testId = _ref.testId,
     testId = _ref$testId === void 0 ? ICON_TYPE_TEST_ID : _ref$testId;
@@ -24,6 +34,11 @@ var IconRenderType = function IconRenderType(_ref) {
       minWidth: '20px',
       maxWidth: '20px'
     } // having just width: '20px' shrinks it when table width is reduced
-  }));
+  }), text && /*#__PURE__*/React.createElement(Box, {
+    xcss: textWrapperStyles
+  }, /*#__PURE__*/React.createElement(TextRenderType, {
+    testId: ICON_TYPE_TEXT_TEST_ID,
+    text: text
+  })));
 };
 export default IconRenderType;

package/dist/types/state/actions/index.d.ts

@@ -1,6 +1,6 @@
 import { type Action } from 'react-sweet-state';
 import { useDatasourceClientExtension } from '@atlaskit/link-client-extension';
-import type { ActionsDiscoveryRequest, AtomicActionExecuteResponse, AtomicActionInterface } from '@atlaskit/linking-types';
+import type { ActionsDiscoveryRequest, AtomicActionExecuteRequest, AtomicActionExecuteResponse, AtomicActionInterface } from '@atlaskit/linking-types';
 import { type DatasourceOperationFailedAttributesType, type EventKey } from '../../../src/analytics/generated/analytics.types';
 import type createEventPayload from '../../../src/analytics/generated/create-event-payload';
 type IntegrationKey = string;
@@ -96,6 +96,7 @@ export declare const useAtomicUpdateActionSchema: import("react-sweet-state").Ho
     fieldKey: string;
     integrationKey: string;
 }>;
+export type ExecuteFetch = <E>(inputs: AtomicActionExecuteRequest['parameters']['inputs']) => Promise<E>;
 /**
  * Given an ARI + fieldKey + integrationKey
  * Returns an executable action that updates a field on the entity if the user has permissions to do so
@@ -113,6 +114,6 @@ export declare const useExecuteAtomicAction: ({ ari, fieldKey, integrationKey, }
     integrationKey: string;
 }) => {
     execute?: ((value: string | number) => Promise<AtomicActionExecuteResponse<unknown>>) | undefined;
-    executeFetch?: (<E>(inputs: any) => Promise<E>) | undefined;
+    executeFetch?: ExecuteFetch | undefined;
 };
 export {};

package/dist/types/ui/issue-like-table/edit-type/status/index.d.ts

@@ -1,10 +1,11 @@
 import React from 'react';
 import { type FieldProps } from '@atlaskit/form';
+import type { ExecuteFetch } from '../../../../state/actions';
 import type { DatasourceTypeWithOnlyValues } from '../../types';
 interface Props extends Omit<FieldProps<string>, 'value'> {
     currentValue: DatasourceTypeWithOnlyValues;
     setEditValues: React.Dispatch<React.SetStateAction<DatasourceTypeWithOnlyValues>>;
-    executeFetch?: <E>(inputs: any) => Promise<E>;
+    executeFetch?: ExecuteFetch;
 }
 declare const StatusEditType: (props: Props) => JSX.Element;
 export default StatusEditType;

package/dist/types/ui/issue-like-table/render-type/icon/index.d.ts

@@ -4,5 +4,6 @@ interface IconProps extends Icon {
     testId?: string;
 }
 export declare const ICON_TYPE_TEST_ID = "link-datasource-render-type--icon";
-declare const IconRenderType: ({ label, source, testId }: IconProps) => JSX.Element;
+export declare const ICON_TYPE_TEXT_TEST_ID = "link-datasource-render-type--icon-text";
+declare const IconRenderType: ({ label, text, source, testId }: IconProps) => JSX.Element;
 export default IconRenderType;

package/dist/types-ts4.5/state/actions/index.d.ts

@@ -1,6 +1,6 @@
 import { type Action } from 'react-sweet-state';
 import { useDatasourceClientExtension } from '@atlaskit/link-client-extension';
-import type { ActionsDiscoveryRequest, AtomicActionExecuteResponse, AtomicActionInterface } from '@atlaskit/linking-types';
+import type { ActionsDiscoveryRequest, AtomicActionExecuteRequest, AtomicActionExecuteResponse, AtomicActionInterface } from '@atlaskit/linking-types';
 import { type DatasourceOperationFailedAttributesType, type EventKey } from '../../../src/analytics/generated/analytics.types';
 import type createEventPayload from '../../../src/analytics/generated/create-event-payload';
 type IntegrationKey = string;
@@ -96,6 +96,7 @@ export declare const useAtomicUpdateActionSchema: import("react-sweet-state").Ho
     fieldKey: string;
     integrationKey: string;
 }>;
+export type ExecuteFetch = <E>(inputs: AtomicActionExecuteRequest['parameters']['inputs']) => Promise<E>;
 /**
  * Given an ARI + fieldKey + integrationKey
  * Returns an executable action that updates a field on the entity if the user has permissions to do so
@@ -113,6 +114,6 @@ export declare const useExecuteAtomicAction: ({ ari, fieldKey, integrationKey, }
     integrationKey: string;
 }) => {
     execute?: ((value: string | number) => Promise<AtomicActionExecuteResponse<unknown>>) | undefined;
-    executeFetch?: (<E>(inputs: any) => Promise<E>) | undefined;
+    executeFetch?: ExecuteFetch | undefined;
 };
 export {};

package/dist/types-ts4.5/ui/issue-like-table/edit-type/status/index.d.ts

@@ -1,10 +1,11 @@
 import React from 'react';
 import { type FieldProps } from '@atlaskit/form';
+import type { ExecuteFetch } from '../../../../state/actions';
 import type { DatasourceTypeWithOnlyValues } from '../../types';
 interface Props extends Omit<FieldProps<string>, 'value'> {
     currentValue: DatasourceTypeWithOnlyValues;
     setEditValues: React.Dispatch<React.SetStateAction<DatasourceTypeWithOnlyValues>>;
-    executeFetch?: <E>(inputs: any) => Promise<E>;
+    executeFetch?: ExecuteFetch;
 }
 declare const StatusEditType: (props: Props) => JSX.Element;
 export default StatusEditType;

package/dist/types-ts4.5/ui/issue-like-table/render-type/icon/index.d.ts

@@ -4,5 +4,6 @@ interface IconProps extends Icon {
     testId?: string;
 }
 export declare const ICON_TYPE_TEST_ID = "link-datasource-render-type--icon";
-declare const IconRenderType: ({ label, source, testId }: IconProps) => JSX.Element;
+export declare const ICON_TYPE_TEXT_TEST_ID = "link-datasource-render-type--icon-text";
+declare const IconRenderType: ({ label, text, source, testId }: IconProps) => JSX.Element;
 export default IconRenderType;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "3.8.3",
+	"version": "3.8.5",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -59,7 +59,7 @@
 		"@atlaskit/layering": "^0.7.0",
 		"@atlaskit/link-client-extension": "^2.4.0",
 		"@atlaskit/linking-common": "^6.0.0",
-		"@atlaskit/linking-types": "^9.4.0",
+		"@atlaskit/linking-types": "^9.5.0",
 		"@atlaskit/logo": "^14.3.0",
 		"@atlaskit/lozenge": "^11.12.0",
 		"@atlaskit/modal-dialog": "^12.17.0",