@atlaskit/link-datasource 2.11.12 → 2.11.14

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/link-datasource
 
+## 2.11.14
+
+### Patch Changes
+
+- [#134332](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/134332)
+  [`ba2a672c564ec`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ba2a672c564ec) -
+  Fix displaying cached data after inline edit updates
+- Updated dependencies
+
+## 2.11.13
+
+### Patch Changes
+
+- [#134868](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/134868)
+  [`2b61da0339af2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2b61da0339af2) -
+  [ux] Enforce mininum width of the datasource column
+- [#119756](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/119756)
+  [`3ebb67c9feed7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3ebb67c9feed7) -
+  Adds dependency to @atlaskit/atlassian-context to use isFedRamp() function to exclude connections
+  to actions service and 2 way sync functionality, behind existing feature flag so no functional
+  behaviour change.
+
 ## 2.11.12
 
 ### Patch Changes

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -11,6 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+var _atlassianContext = require("@atlaskit/atlassian-context");
 var _linkClientExtension = require("@atlaskit/link-client-extension");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../analytics");
@@ -318,18 +319,20 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
               return [].concat((0, _toConsumableArray2.default)(currentIds), (0, _toConsumableArray2.default)(newIds));
             });
             if ((0, _platformFeatureFlags.fg)('platform-datasources-enable-two-way-sync')) {
-              if (typeof integrationKey === 'string') {
-                aris = items.reduce(function (acc, item) {
-                  var _item$ari;
-                  return typeof ((_item$ari = item.ari) === null || _item$ari === void 0 ? void 0 : _item$ari.data) === 'string' ? [].concat((0, _toConsumableArray2.default)(acc), [item.ari.data]) : acc;
-                }, []);
-                if (aris.length && _destinationObjectTypes.length) {
-                  discoverActions({
-                    aris: aris,
-                    integrationKey: integrationKey,
-                    fieldKeys: fieldKeys,
-                    entityType: _destinationObjectTypes[0]
-                  });
+              if (!(0, _atlassianContext.isFedRamp)()) {
+                if (typeof integrationKey === 'string') {
+                  aris = items.reduce(function (acc, item) {
+                    var _item$ari;
+                    return typeof ((_item$ari = item.ari) === null || _item$ari === void 0 ? void 0 : _item$ari.data) === 'string' ? [].concat((0, _toConsumableArray2.default)(acc), [item.ari.data]) : acc;
+                  }, []);
+                  if (aris.length && _destinationObjectTypes.length) {
+                    discoverActions({
+                      aris: aris,
+                      integrationKey: integrationKey,
+                      fieldKeys: fieldKeys,
+                      entityType: _destinationObjectTypes[0]
+                    });
+                  }
                 }
               }
             }

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

@@ -178,7 +178,8 @@ var useExecuteAtomicAction = exports.useExecuteAtomicAction = function useExecut
     _useAtomicUpdateActio2 = (0, _slicedToArray2.default)(_useAtomicUpdateActio, 1),
     schema = _useAtomicUpdateActio2[0];
   var _useDatasourceClientE2 = (0, _linkClientExtension.useDatasourceClientExtension)(),
-    executeAction = _useDatasourceClientE2.executeAtomicAction;
+    executeAction = _useDatasourceClientE2.executeAtomicAction,
+    invalidateDatasourceDataCacheByAri = _useDatasourceClientE2.invalidateDatasourceDataCacheByAri;
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useErrorLogger = (0, _useErrorLogger2.default)({
@@ -199,6 +200,8 @@ var useExecuteAtomicAction = exports.useExecuteAtomicAction = function useExecut
         }
       }
     }).then(function (resp) {
+      // Force data to refresh after update
+      invalidateDatasourceDataCacheByAri(ari);
       fireEvent('operational.actionExecution.success', {
         integrationKey: integrationKey,
         experience: 'datasource'
@@ -209,7 +212,7 @@ var useExecuteAtomicAction = exports.useExecuteAtomicAction = function useExecut
       // Rethrow up to component for flags and other handling
       throw error;
     });
-  }, [schema, executeAction, integrationKey, fieldKey, ari, fireEvent, captureError]);
+  }, [schema, executeAction, integrationKey, fieldKey, ari, invalidateDatasourceDataCacheByAri, fireEvent, captureError]);
   if (!schema) {
     return {};
   }

package/dist/cjs/ui/issue-like-table/draggable-table-heading.js

@@ -289,6 +289,9 @@ var DraggableTableHeading = exports.DraggableTableHeading = function DraggableTa
 
         // Set the width of our header being resized
         var proposedWidth = initialWidth + relativeDistanceX;
+        if (proposedWidth < (0, _utils.getColumnMinWidth)(id)) {
+          proposedWidth = (0, _utils.getColumnMinWidth)(id);
+        }
 
         // We update width css directly live
         mainHeaderCell.style.setProperty('width', "".concat(proposedWidth, "px"));
@@ -298,9 +301,6 @@ var DraggableTableHeading = exports.DraggableTableHeading = function DraggableTa
         setState(idleState);
         if (onWidthChange) {
           var cssWidth = +mainHeaderCell.style.getPropertyValue('width').slice(0, -2);
-          if (cssWidth < _utils.COLUMN_MIN_WIDTH) {
-            cssWidth = _utils.COLUMN_MIN_WIDTH;
-          }
           onWidthChange(cssWidth);
         }
       }

package/dist/cjs/ui/issue-like-table/utils.js

@@ -3,10 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getWidthCss = exports.getColumnAction = exports.COLUMN_MIN_WIDTH = exports.COLUMN_BASE_WIDTH = void 0;
+exports.getWidthCss = exports.getColumnMinWidth = exports.getColumnAction = exports.COLUMN_BASE_WIDTH = void 0;
 var _types = require("../../analytics/types");
 var COLUMN_BASE_WIDTH = exports.COLUMN_BASE_WIDTH = 8;
-var COLUMN_MIN_WIDTH = exports.COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 3;
+var COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 4;
+var keyBasedMinWidthMap = {
+  summary: COLUMN_BASE_WIDTH * 26
+};
+var getColumnMinWidth = exports.getColumnMinWidth = function getColumnMinWidth(key) {
+  return keyBasedMinWidthMap[key] || COLUMN_MIN_WIDTH;
+};
+
 /**
  * Generate width related portion of css for table cell.
  *

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import isEqual from 'lodash/isEqual';
+import { isFedRamp } from '@atlaskit/atlassian-context';
 import { DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE, useDatasourceClientExtension } from '@atlaskit/link-client-extension';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../analytics';
@@ -201,18 +202,20 @@ export const useDatasourceTableState = ({
         const newIds = onAddItems(items, typeof integrationKey === 'string' ? integrationKey : undefined);
         setResponseItemIds(currentIds => [...currentIds, ...newIds]);
         if (fg('platform-datasources-enable-two-way-sync')) {
-          if (typeof integrationKey === 'string') {
-            const aris = items.reduce((acc, item) => {
-              var _item$ari;
-              return typeof ((_item$ari = item.ari) === null || _item$ari === void 0 ? void 0 : _item$ari.data) === 'string' ? [...acc, item.ari.data] : acc;
-            }, []);
-            if (aris.length && destinationObjectTypes.length) {
-              discoverActions({
-                aris,
-                integrationKey,
-                fieldKeys,
-                entityType: destinationObjectTypes[0]
-              });
+          if (!isFedRamp()) {
+            if (typeof integrationKey === 'string') {
+              const aris = items.reduce((acc, item) => {
+                var _item$ari;
+                return typeof ((_item$ari = item.ari) === null || _item$ari === void 0 ? void 0 : _item$ari.data) === 'string' ? [...acc, item.ari.data] : acc;
+              }, []);
+              if (aris.length && destinationObjectTypes.length) {
+                discoverActions({
+                  aris,
+                  integrationKey,
+                  fieldKeys,
+                  entityType: destinationObjectTypes[0]
+                });
+              }
             }
           }
         }

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

@@ -156,7 +156,8 @@ export const useExecuteAtomicAction = ({
     integrationKey
   });
   const {
-    executeAtomicAction: executeAction
+    executeAtomicAction: executeAction,
+    invalidateDatasourceDataCacheByAri
   } = useDatasourceClientExtension();
   const {
     fireEvent
@@ -182,6 +183,8 @@ export const useExecuteAtomicAction = ({
         }
       }
     }).then(resp => {
+      // Force data to refresh after update
+      invalidateDatasourceDataCacheByAri(ari);
       fireEvent('operational.actionExecution.success', {
         integrationKey: integrationKey,
         experience: 'datasource'
@@ -192,7 +195,7 @@ export const useExecuteAtomicAction = ({
       // Rethrow up to component for flags and other handling
       throw error;
     });
-  }, [schema, executeAction, integrationKey, fieldKey, ari, fireEvent, captureError]);
+  }, [schema, executeAction, integrationKey, fieldKey, ari, invalidateDatasourceDataCacheByAri, fireEvent, captureError]);
   if (!schema) {
     return {};
   }

package/dist/es2019/ui/issue-like-table/draggable-table-heading.js

@@ -28,7 +28,7 @@ import { useDatasourceAnalyticsEvents } from '../../analytics';
 import { GlyphPlaceholder, UnwrapTextIcon, WrapTextIcon } from './custom-icons';
 import { issueLikeTableMessages } from './messages';
 import { TableHeading } from './styled';
-import { COLUMN_MIN_WIDTH, getWidthCss } from './utils';
+import { getColumnMinWidth, getWidthCss } from './utils';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
 const DropdownParent = styled.div({
   display: 'flex',
@@ -273,6 +273,9 @@ export const DraggableTableHeading = ({
 
         // Set the width of our header being resized
         let proposedWidth = initialWidth + relativeDistanceX;
+        if (proposedWidth < getColumnMinWidth(id)) {
+          proposedWidth = getColumnMinWidth(id);
+        }
 
         // We update width css directly live
         mainHeaderCell.style.setProperty('width', `${proposedWidth}px`);
@@ -282,9 +285,6 @@ export const DraggableTableHeading = ({
         setState(idleState);
         if (onWidthChange) {
           let cssWidth = +mainHeaderCell.style.getPropertyValue('width').slice(0, -2);
-          if (cssWidth < COLUMN_MIN_WIDTH) {
-            cssWidth = COLUMN_MIN_WIDTH;
-          }
           onWidthChange(cssWidth);
         }
       }

package/dist/es2019/ui/issue-like-table/utils.js

@@ -1,6 +1,13 @@
 import { DatasourceAction } from '../../analytics/types';
 export const COLUMN_BASE_WIDTH = 8;
-export const COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 3;
+const COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 4;
+const keyBasedMinWidthMap = {
+  summary: COLUMN_BASE_WIDTH * 26
+};
+export const getColumnMinWidth = key => {
+  return keyBasedMinWidthMap[key] || COLUMN_MIN_WIDTH;
+};
+
 /**
  * Generate width related portion of css for table cell.
  *

package/dist/esm/hooks/useDatasourceTableState.js

@@ -4,6 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useCallback, useEffect, useRef, useState } from 'react';
 import isEqual from 'lodash/isEqual';
+import { isFedRamp } from '@atlaskit/atlassian-context';
 import { DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE, useDatasourceClientExtension } from '@atlaskit/link-client-extension';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../analytics';
@@ -311,18 +312,20 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
               return [].concat(_toConsumableArray(currentIds), _toConsumableArray(newIds));
             });
             if (fg('platform-datasources-enable-two-way-sync')) {
-              if (typeof integrationKey === 'string') {
-                aris = items.reduce(function (acc, item) {
-                  var _item$ari;
-                  return typeof ((_item$ari = item.ari) === null || _item$ari === void 0 ? void 0 : _item$ari.data) === 'string' ? [].concat(_toConsumableArray(acc), [item.ari.data]) : acc;
-                }, []);
-                if (aris.length && _destinationObjectTypes.length) {
-                  discoverActions({
-                    aris: aris,
-                    integrationKey: integrationKey,
-                    fieldKeys: fieldKeys,
-                    entityType: _destinationObjectTypes[0]
-                  });
+              if (!isFedRamp()) {
+                if (typeof integrationKey === 'string') {
+                  aris = items.reduce(function (acc, item) {
+                    var _item$ari;
+                    return typeof ((_item$ari = item.ari) === null || _item$ari === void 0 ? void 0 : _item$ari.data) === 'string' ? [].concat(_toConsumableArray(acc), [item.ari.data]) : acc;
+                  }, []);
+                  if (aris.length && _destinationObjectTypes.length) {
+                    discoverActions({
+                      aris: aris,
+                      integrationKey: integrationKey,
+                      fieldKeys: fieldKeys,
+                      entityType: _destinationObjectTypes[0]
+                    });
+                  }
                 }
               }
             }

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

@@ -172,7 +172,8 @@ export var useExecuteAtomicAction = function useExecuteAtomicAction(_ref5) {
     _useAtomicUpdateActio2 = _slicedToArray(_useAtomicUpdateActio, 1),
     schema = _useAtomicUpdateActio2[0];
   var _useDatasourceClientE2 = useDatasourceClientExtension(),
-    executeAction = _useDatasourceClientE2.executeAtomicAction;
+    executeAction = _useDatasourceClientE2.executeAtomicAction,
+    invalidateDatasourceDataCacheByAri = _useDatasourceClientE2.invalidateDatasourceDataCacheByAri;
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useErrorLogger = useErrorLogger({
@@ -193,6 +194,8 @@ export var useExecuteAtomicAction = function useExecuteAtomicAction(_ref5) {
         }
       }
     }).then(function (resp) {
+      // Force data to refresh after update
+      invalidateDatasourceDataCacheByAri(ari);
       fireEvent('operational.actionExecution.success', {
         integrationKey: integrationKey,
         experience: 'datasource'
@@ -203,7 +206,7 @@ export var useExecuteAtomicAction = function useExecuteAtomicAction(_ref5) {
       // Rethrow up to component for flags and other handling
       throw error;
     });
-  }, [schema, executeAction, integrationKey, fieldKey, ari, fireEvent, captureError]);
+  }, [schema, executeAction, integrationKey, fieldKey, ari, invalidateDatasourceDataCacheByAri, fireEvent, captureError]);
   if (!schema) {
     return {};
   }

package/dist/esm/ui/issue-like-table/draggable-table-heading.js

@@ -34,7 +34,7 @@ import { useDatasourceAnalyticsEvents } from '../../analytics';
 import { GlyphPlaceholder, UnwrapTextIcon, WrapTextIcon } from './custom-icons';
 import { issueLikeTableMessages } from './messages';
 import { TableHeading } from './styled';
-import { COLUMN_MIN_WIDTH, getWidthCss } from './utils';
+import { getColumnMinWidth, getWidthCss } from './utils';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-styled -- To migrate as part of go/ui-styling-standard
 var DropdownParent = styled.div({
   display: 'flex',
@@ -280,6 +280,9 @@ export var DraggableTableHeading = function DraggableTableHeading(_ref) {
 
         // Set the width of our header being resized
         var proposedWidth = initialWidth + relativeDistanceX;
+        if (proposedWidth < getColumnMinWidth(id)) {
+          proposedWidth = getColumnMinWidth(id);
+        }
 
         // We update width css directly live
         mainHeaderCell.style.setProperty('width', "".concat(proposedWidth, "px"));
@@ -289,9 +292,6 @@ export var DraggableTableHeading = function DraggableTableHeading(_ref) {
         setState(idleState);
         if (onWidthChange) {
           var cssWidth = +mainHeaderCell.style.getPropertyValue('width').slice(0, -2);
-          if (cssWidth < COLUMN_MIN_WIDTH) {
-            cssWidth = COLUMN_MIN_WIDTH;
-          }
           onWidthChange(cssWidth);
         }
       }

package/dist/esm/ui/issue-like-table/utils.js

@@ -1,6 +1,13 @@
 import { DatasourceAction } from '../../analytics/types';
 export var COLUMN_BASE_WIDTH = 8;
-export var COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 3;
+var COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 4;
+var keyBasedMinWidthMap = {
+  summary: COLUMN_BASE_WIDTH * 26
+};
+export var getColumnMinWidth = function getColumnMinWidth(key) {
+  return keyBasedMinWidthMap[key] || COLUMN_MIN_WIDTH;
+};
+
 /**
  * Generate width related portion of css for table cell.
  *

package/dist/types/ui/issue-like-table/utils.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="react" />
 import { DatasourceAction } from '../../analytics/types';
 export declare const COLUMN_BASE_WIDTH = 8;
-export declare const COLUMN_MIN_WIDTH: number;
 export type GetWidthCss = (arg: {
     shouldUseWidth: boolean;
     width?: number;
 }) => React.CSSProperties;
+export declare const getColumnMinWidth: (key: string) => number;
 /**
  * Generate width related portion of css for table cell.
  *

package/dist/types-ts4.5/ui/issue-like-table/utils.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="react" />
 import { DatasourceAction } from '../../analytics/types';
 export declare const COLUMN_BASE_WIDTH = 8;
-export declare const COLUMN_MIN_WIDTH: number;
 export type GetWidthCss = (arg: {
     shouldUseWidth: boolean;
     width?: number;
 }) => React.CSSProperties;
+export declare const getColumnMinWidth: (key: string) => number;
 /**
  * Generate width related portion of css for table cell.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "2.11.12",
+	"version": "2.11.14",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -24,8 +24,6 @@
 	"atlaskit:src": "src/index.ts",
 	"atlassian": {
 		"team": "Linking Platform",
-		"inPublicMirror": false,
-		"releaseModel": "continuous",
 		"i18n": true,
 		"website": {
 			"name": "Link Datasource"
@@ -38,6 +36,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
 		"@atlaskit/analytics-next": "^10.1.0",
+		"@atlaskit/atlassian-context": "^0.0.1",
 		"@atlaskit/avatar": "^21.15.0",
 		"@atlaskit/avatar-group": "^9.11.0",
 		"@atlaskit/badge": "^16.4.0",
@@ -55,10 +54,10 @@
 		"@atlaskit/inline-edit": "^13.7.0",
 		"@atlaskit/intl-messages-provider": "^1.0.0",
 		"@atlaskit/jql-ast": "^3.3.0",
-		"@atlaskit/jql-editor": "^4.5.0",
+		"@atlaskit/jql-editor": "^4.6.0",
 		"@atlaskit/jql-editor-autocomplete-rest": "^2.0.0",
 		"@atlaskit/layering": "^0.4.0",
-		"@atlaskit/link-client-extension": "^2.2.0",
+		"@atlaskit/link-client-extension": "^2.3.0",
 		"@atlaskit/linking-common": "^5.11.0",
 		"@atlaskit/linking-types": "^9.0.0",
 		"@atlaskit/logo": "^14.2.0",
@@ -66,12 +65,12 @@
 		"@atlaskit/modal-dialog": "^12.15.0",
 		"@atlaskit/outbound-auth-flow-client": "^3.4.5",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/popup": "^1.23.0",
+		"@atlaskit/popup": "^1.24.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.3.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.2.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
-		"@atlaskit/primitives": "^12.0.0",
+		"@atlaskit/primitives": "^12.1.0",
 		"@atlaskit/select": "^17.15.0",
 		"@atlaskit/smart-card": "^27.19.0",
 		"@atlaskit/smart-user-picker": "6.10.2",